Skip to content

Commit 6ed9974

Browse files
DarlCatakleshchev
authored andcommitted
Fix incorrectly calculated number in comment and where it was referenced
1 parent c4204a9 commit 6ed9974

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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=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>
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=32768. 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
102102
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 << 15 // 0b10000000000000000 (65535)
105+
MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 15 // 0b10000000000000000 (32768)
106106
};
107107
bool shouldAllowFirstMediaInteraction(const LLPickInfo& info, bool moap_flag);
108108
bool handleMediaClick(const LLPickInfo& info);

0 commit comments

Comments
 (0)