Media first click interact large number value fix
parent
0c39bdfd4d
commit
c4204a9687
|
|
@ -144,16 +144,16 @@ Note: This requires the avatar that is performing the tests to physically be in
|
||||||
|
|
||||||
### Case 7 (MEDIA_FIRST_CLICK_ANY) (optional)
|
### Case 7 (MEDIA_FIRST_CLICK_ANY) (optional)
|
||||||
|
|
||||||
Ensure that debug setting `MediaFirstClickInteract` is set to `31`
|
Ensure that debug setting `MediaFirstClickInteract` is set to `32767`
|
||||||
|
|
||||||
Repeat test cases 1-6.
|
Repeat test cases 1-6.
|
||||||
|
|
||||||
1. Test case 1 should fail
|
1. Test case 1 should fail
|
||||||
2. Test cases 2-6 should pass
|
2. Test cases 2-6 should pass
|
||||||
|
|
||||||
### Case 8 (MEDIA_FIRST_CLICK_ALL) (optional)
|
### Case 8 (MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG) (optional)
|
||||||
|
|
||||||
Ensure that debug setting `MediaFirstClickInteract` is set to `1073741824`
|
Ensure that debug setting `MediaFirstClickInteract` is set to `65535`
|
||||||
|
|
||||||
Repeat test cases 1-6, there is no pass/fail for this run.
|
Repeat test cases 1-6, there is no pass/fail for this run.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16237,7 +16237,7 @@
|
||||||
<key>MediaFirstClickInteract</key>
|
<key>MediaFirstClickInteract</key>
|
||||||
<map>
|
<map>
|
||||||
<key>Comment</key>
|
<key>Comment</key>
|
||||||
<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>
|
<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>
|
||||||
<key>Persist</key>
|
<key>Persist</key>
|
||||||
<integer>1</integer>
|
<integer>1</integer>
|
||||||
<key>Type</key>
|
<key>Type</key>
|
||||||
|
|
|
||||||
|
|
@ -99,10 +99,10 @@ private:
|
||||||
MEDIA_FIRST_CLICK_LAND = 1 << 4, // 0b00010000 (16)
|
MEDIA_FIRST_CLICK_LAND = 1 << 4, // 0b00010000 (16)
|
||||||
|
|
||||||
// Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all previous flags)
|
// Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all previous flags)
|
||||||
MEDIA_FIRST_CLICK_ANY = ~(3<<30), // 0b00111111111111111111111111111111
|
MEDIA_FIRST_CLICK_ANY = (1 << 15) - 1, // 0b0111111111111111 (32767)
|
||||||
|
|
||||||
// Covers all media regardless of other rules or PRIM_MEDIA_FIRST_CLICK_INTERACT
|
// Covers all media regardless of other rules or PRIM_MEDIA_FIRST_CLICK_INTERACT
|
||||||
MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 30 // 0b01000000000000000000000000000000 (1073741824)
|
MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 15 // 0b10000000000000000 (65535)
|
||||||
};
|
};
|
||||||
bool shouldAllowFirstMediaInteraction(const LLPickInfo& info, bool moap_flag);
|
bool shouldAllowFirstMediaInteraction(const LLPickInfo& info, bool moap_flag);
|
||||||
bool handleMediaClick(const LLPickInfo& info);
|
bool handleMediaClick(const LLPickInfo& info);
|
||||||
|
|
|
||||||
|
|
@ -422,11 +422,11 @@
|
||||||
<item
|
<item
|
||||||
label="Anyone's objects"
|
label="Anyone's objects"
|
||||||
name="media_first_interact_any"
|
name="media_first_interact_any"
|
||||||
value="1073741823"/>
|
value="32767"/>
|
||||||
<item
|
<item
|
||||||
label="All MOAP"
|
label="All MOAP"
|
||||||
name="media_first_click_all"
|
name="media_first_click_all"
|
||||||
value="2147483647"/>
|
value="65535"/>
|
||||||
</combo_box>
|
</combo_box>
|
||||||
<check_box
|
<check_box
|
||||||
name="media_show_on_others_btn"
|
name="media_show_on_others_btn"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue