diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-08-06 14:17:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-06 14:17:18 +0300 |
| commit | acc8928330fe1e5022a1e968afe7d7027b86a63a (patch) | |
| tree | b95453ecc772cb4eaf275aab6fb5a882087a4c33 /indra/newview/lltoolpie.h | |
| parent | c25df5224f7bf150ddc56014b0389985da2eb542 (diff) | |
| parent | f338b91f7c9dbfe999b5ea9a1facb9eaeafb3407 (diff) | |
Merge release/2025.05 into develop
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index d9daad9515..ec54e0207d 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -99,10 +99,10 @@ 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 = ~(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 - MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 30 // 0b01000000000000000000000000000000 (1073741824) + MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 15 // 0b10000000000000000 (32768) }; bool shouldAllowFirstMediaInteraction(const LLPickInfo& info, bool moap_flag); bool handleMediaClick(const LLPickInfo& info); |