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.cpp | |
| 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.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 8 |
1 files changed, 1 insertions, 7 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; |