summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfGangS <flamin2k8@gmail.com>2025-06-27 22:19:43 +0100
committerWolfGangS <flamin2k8@gmail.com>2025-06-27 22:19:43 +0100
commit13a8e3b830bfcf67d4376165f74da4def6947fce (patch)
tree5830fcdcaa64c11150b7bb296c15beb8c95ec7a0
parente3ce14d0e866c82dc55b70fa0235dde76c8133ba (diff)
Reviewed changes
-rw-r--r--indra/newview/lltoolpie.h3
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_sound.xml4
2 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index ce02ea7d60..ee7945d16f 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -99,8 +99,7 @@ private:
MEDIA_FIRST_CLICK_LAND = 1 << 4, // 0b00010000 (16)
// Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all previous flags)
- MEDIA_FIRST_CLICK_ANY = 1073741823,// 0b00111111111111111111111111111111
- //
+ MEDIA_FIRST_CLICK_ANY = ~(3<<30), // 0b00111111111111111111111111111111
// Covers all media regardless of other rules or PRIM_MEDIA_FIRST_CLICK_INTERACT
MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 30 // 0b01000000000000000000000000000000 (1073741824)
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index d4fe8b2e79..473e54812d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -408,7 +408,7 @@
name="media_first_click_own"
value="3"/>
<item
- label="Friend objects"
+ label="Friends' objects"
name="media_first_click_friend"
value="11"/>
<item
@@ -420,7 +420,7 @@
name="media_first_click_land"
value="31"/>
<item
- label="Anyones objects"
+ label="Anyone's objects"
name="media_first_interact_any"
value="1073741823"/>
<item