diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-06-27 19:08:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-27 19:08:56 -0400 |
| commit | 2fdca60e61543309d43f5fa99ba2b40f209aec20 (patch) | |
| tree | 9e473b5ecbd873062b29d91ee94cc06453e12dd7 /indra/newview/lltoolpie.h | |
| parent | 45ca7fc73bfddb8ac2524e51b7a65e62ae763bf0 (diff) | |
| parent | 480eae537e1b21338bb6ca2da8b15576bde9e72e (diff) | |
Merge pull request #4304 from WolfGangS/media-first-click-fixes
Media first click fixes for #4177
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 10 |
1 files changed, 3 insertions, 7 deletions
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); |