Skip to content
Snippets Groups Projects
Commit 7586d8fc authored by Monroe Linden's avatar Monroe Linden
Browse files

fix for EXT-2903 ([BSI] Activating inspector while "Zoomed into Media" results in broken inspector)

Media Focus and the inspector were fighting over the object selection.

Fixed by calling LLViewerMediaFocus::clearFocus() right before setting the selection in LLInspectObject::onOpen().
parent d16f6a6e
No related branches found
No related tags found
No related merge requests found
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "llslurl.h" #include "llslurl.h"
#include "llviewermenu.h" // handle_object_touch(), handle_buy() #include "llviewermenu.h" // handle_object_touch(), handle_buy()
#include "llviewermedia.h" #include "llviewermedia.h"
#include "llviewermediafocus.h"
#include "llviewerobjectlist.h" // to select the requested object #include "llviewerobjectlist.h" // to select the requested object
// Linden libraries // Linden libraries
...@@ -214,6 +215,10 @@ void LLInspectObject::onOpen(const LLSD& data) ...@@ -214,6 +215,10 @@ void LLInspectObject::onOpen(const LLSD& data)
LLViewerObject* obj = gObjectList.findObject( mObjectID ); LLViewerObject* obj = gObjectList.findObject( mObjectID );
if (obj) if (obj)
{ {
// Media focus and this code fight over the select manager.
// Make sure any media is unfocused before changing the selection here.
LLViewerMediaFocus::getInstance()->clearFocus();
LLSelectMgr::instance().deselectAll(); LLSelectMgr::instance().deselectAll();
mObjectSelection = LLSelectMgr::instance().selectObjectAndFamily(obj); mObjectSelection = LLSelectMgr::instance().selectObjectAndFamily(obj);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment