Fixes for first click moap

1 files changed, 1 insertions, 7 deletions

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index e5bbc73af0..ac51a9fa3e 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_BYPASS_MOAP_FLAG))
     {
         LL_DEBUGS_ONCE() << "PRIM_MEDIA_FIRST_CLICK_INTERACT not set" << LL_ENDL;
         return false;