Second Life viewer sources 1.18.1.2

1 files changed, 11 insertions, 8 deletions

diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index 85cfc4e..c926afa 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -74,18 +74,21 @@ BOOL LLFloaterInspect::isVisible()
 
 void LLFloaterInspect::show(void* ignored)
 {
-        if(sInstance)
-        {
-                sInstance->open();
-        }
-        else
+        // setForceSelection ensures that the pie menu does not deselect things when it 
+        // looses the focus (this can happen with "select own objects only" enabled
+        // VWR-1471
+        BOOL forcesel = gSelectMgr->setForceSelection(TRUE);
+
+        if (!sInstance) // first use
         {
-                LLFloaterInspect* self = new LLFloaterInspect;
-                self->open();
+                sInstance = new LLFloaterInspect;
         }
 
-        sInstance->mObjectSelection = gSelectMgr->getSelection();
+        sInstance->open();
         select_tool(gToolInspect);
+        gSelectMgr->setForceSelection(forcesel);        // restore previouis value
+
+        sInstance->mObjectSelection = gSelectMgr->getSelection();
         sInstance->refresh();
 }