Skip to content

Commit c4204a9

Browse files
DarlCatakleshchev
authored andcommitted
Media first click interact large number value fix
1 parent 0c39bdf commit c4204a9

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

doc/testplans/PRIM_MEDIA_FIRST_CLICK_INTERACT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,16 @@ Note: This requires the avatar that is performing the tests to physically be in
144144

145145
### Case 7 (MEDIA_FIRST_CLICK_ANY) (optional)
146146

147-
Ensure that debug setting `MediaFirstClickInteract` is set to `31`
147+
Ensure that debug setting `MediaFirstClickInteract` is set to `32767`
148148

149149
Repeat test cases 1-6.
150150

151151
1. Test case 1 should fail
152152
2. Test cases 2-6 should pass
153153

154-
### Case 8 (MEDIA_FIRST_CLICK_ALL) (optional)
154+
### Case 8 (MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG) (optional)
155155

156-
Ensure that debug setting `MediaFirstClickInteract` is set to `1073741824`
156+
Ensure that debug setting `MediaFirstClickInteract` is set to `65535`
157157

158158
Repeat test cases 1-6, there is no pass/fail for this run.
159159

indra/newview/app_settings/settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16237,7 +16237,7 @@
1623716237
<key>MediaFirstClickInteract</key>
1623816238
<map>
1623916239
<key>Comment</key>
16240-
<string>This setting controls which media (once loaded) does not require a first click to focus before interaction can begin. This allows clicks to be passed directly to media bypassing the focus click requirement. This setting is a bitfield, precomputed values are as follows: Disabled=0; Worn HUDs only=1; Owned objects=3; Friend objects=7; Group objects=15; Landowner objects=31; Any object=31; All MOAP=1073741824. For complete details see lltoolpie.h enum MediaFirstClickTypes.</string>
16240+
<string>This setting controls which media (once loaded) does not require a first click to focus before interaction can begin. This allows clicks to be passed directly to media bypassing the focus click requirement. This setting is a bitfield, precomputed values are as follows: Disabled=0; Worn HUDs only=1; Owned objects=2; Friend objects=4; Group objects=8; Landowner objects=16; Any object=32767; All MOAP=65535. For complete details see lltoolpie.h enum MediaFirstClickTypes.</string>
1624116241
<key>Persist</key>
1624216242
<integer>1</integer>
1624316243
<key>Type</key>

indra/newview/lltoolpie.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
9999
MEDIA_FIRST_CLICK_LAND = 1 << 4, // 0b00010000 (16)
100100

101101
// Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all previous flags)
102-
MEDIA_FIRST_CLICK_ANY = ~(3<<30), // 0b00111111111111111111111111111111
102+
MEDIA_FIRST_CLICK_ANY = (1 << 15) - 1, // 0b0111111111111111 (32767)
103103

104104
// Covers all media regardless of other rules or PRIM_MEDIA_FIRST_CLICK_INTERACT
105-
MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 30 // 0b01000000000000000000000000000000 (1073741824)
105+
MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 15 // 0b10000000000000000 (65535)
106106
};
107107
bool shouldAllowFirstMediaInteraction(const LLPickInfo& info, bool moap_flag);
108108
bool handleMediaClick(const LLPickInfo& info);

indra/newview/skins/default/xui/en/panel_preferences_sound.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,11 +422,11 @@
422422
<item
423423
label="Anyone's objects"
424424
name="media_first_interact_any"
425-
value="1073741823"/>
425+
value="32767"/>
426426
<item
427427
label="All MOAP"
428428
name="media_first_click_all"
429-
value="2147483647"/>
429+
value="65535"/>
430430
</combo_box>
431431
<check_box
432432
name="media_show_on_others_btn"

0 commit comments

Comments
 (0)