diff options
| author | Darl <me@darl.cat> | 2025-07-25 11:00:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-25 19:00:01 +0300 |
| commit | 210f559efe81864c7581677882c867dc14b7f854 (patch) | |
| tree | 66df3bbcc20bf08bf7915bf2524e43516f5d787f | |
| parent | 5d4e2c91b8c4f7e14ef3604df9f1050b05c00380 (diff) | |
Media first click interact self check fix (#4406, #4426)
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 618955c83b..dc27e11a0b 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1541,12 +1541,6 @@ bool LLToolPie::shouldAllowFirstMediaInteraction(const LLPickInfo& pick, bool mo return false; } - // Own objects - if((FirstClickPref & MEDIA_FIRST_CLICK_OWN) && object->permYouOwner()) - { - LL_DEBUGS_ONCE() << "FirstClickPref & MEDIA_FIRST_CLICK_OWN" << LL_ENDL; - return true; - } // HUD attachments if((FirstClickPref & MEDIA_FIRST_CLICK_HUD) && object->isHUDAttachment()) { @@ -1569,6 +1563,13 @@ bool LLToolPie::shouldAllowFirstMediaInteraction(const LLPickInfo& pick, bool mo return false; } + // Own objects + if((FirstClickPref & MEDIA_FIRST_CLICK_OWN) && owner_id == gAgent.getID()) + { + LL_DEBUGS_ONCE() << "FirstClickPref & MEDIA_FIRST_CLICK_OWN" << LL_ENDL; + return true; + } + // Check if the object is owned by a friend of the agent if(FirstClickPref & MEDIA_FIRST_CLICK_FRIEND) { |