diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-06-27 19:25:01 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-06-27 19:25:01 -0400 |
| commit | 6693fd0c4128630e7fe6fade40c2d978d37c8410 (patch) | |
| tree | 02f9350009b704dca4d01bf0ab2716c21f993c64 | |
| parent | ef7bfa5e5260d26505bf8ae90780ee45de9216ef (diff) | |
| parent | 2fdca60e61543309d43f5fa99ba2b40f209aec20 (diff) | |
Merge branch 'develop' into geenz/develop-to-gltf-mesh
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/lltoolpie.h | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 14 |
3 files changed, 11 insertions, 21 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index e5bbc73af0..75b980d358 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1520,14 +1520,8 @@ bool LLToolPie::shouldAllowFirstMediaInteraction(const LLPickInfo& pick, bool mo LL_DEBUGS_ONCE() << "FirstClickPref == MEDIA_FIRST_CLICK_NONE" << LL_ENDL; return false; } - // All objects (overriding PRIM_MEDIA_FIRST_CLICK_INTERACT) - if(FirstClickPref == MEDIA_FIRST_CLICK_ALL) - { - LL_DEBUGS_ONCE() << "FirstClickPref & MEDIA_FIRST_CLICK_ALL" << LL_ENDL; - return true; - } // Every check beyond this point requires PRIM_MEDIA_FIRST_CLICK_INTERACT to be TRUE - if(!moap_flag) + if(!moap_flag && !(FirstClickPref & MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG)) { LL_DEBUGS_ONCE() << "PRIM_MEDIA_FIRST_CLICK_INTERACT not set" << LL_ENDL; return false; diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index f88fc00b4a..ee7945d16f 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -98,15 +98,11 @@ private: MEDIA_FIRST_CLICK_FRIEND = 1 << 3, // 0b00001000 (8) MEDIA_FIRST_CLICK_LAND = 1 << 4, // 0b00010000 (16) - // Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all other flags) - MEDIA_FIRST_CLICK_ANY = MEDIA_FIRST_CLICK_HUD & - MEDIA_FIRST_CLICK_OWN & - MEDIA_FIRST_CLICK_GROUP & - MEDIA_FIRST_CLICK_FRIEND & - MEDIA_FIRST_CLICK_LAND, + // Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all previous flags) + MEDIA_FIRST_CLICK_ANY = ~(3<<30), // 0b00111111111111111111111111111111 // Covers all media regardless of other rules or PRIM_MEDIA_FIRST_CLICK_INTERACT - MEDIA_FIRST_CLICK_ALL = 1 << 30 // 0b01000000000000000000000000000000 (1073741824) + MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 30 // 0b01000000000000000000000000000000 (1073741824) }; bool shouldAllowFirstMediaInteraction(const LLPickInfo& info, bool moap_flag); bool handleMediaClick(const LLPickInfo& info); 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 efe3d4fb42..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,25 +408,25 @@ name="media_first_click_own" value="3"/> <item - label="Friend objects" - name="media_first_click_group" - value="7"/> + label="Friends' objects" + name="media_first_click_friend" + value="11"/> <item label="Group objects" - name="media_first_click_friend" + name="media_first_click_group" value="15"/> <item label="Landowner objects" name="media_first_click_land" value="31"/> <item - label="Any object" + label="Anyone's objects" name="media_first_interact_any" - value="31"/> + value="1073741823"/> <item label="All MOAP" name="media_first_click_all" - value="1073741824"/> + value="2147483647"/> </combo_box> <check_box name="media_show_on_others_btn" |