diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-01-06 12:01:39 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-01-06 12:01:39 -0800 |
| commit | 7586d8fcfde811cb04fb1c95aa0aa235b8df6aff (patch) | |
| tree | 1ed99067687a10ab9417cc241faa68a2814b9b1c /indra/newview | |
| parent | d16f6a6e1a2c26bb87e3abea7a1b95a63b68594c (diff) | |
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().
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinspectobject.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp index cb35a287e9..b3bac0453a 100644 --- a/indra/newview/llinspectobject.cpp +++ b/indra/newview/llinspectobject.cpp @@ -41,6 +41,7 @@ #include "llslurl.h" #include "llviewermenu.h" // handle_object_touch(), handle_buy() #include "llviewermedia.h" +#include "llviewermediafocus.h" #include "llviewerobjectlist.h" // to select the requested object // Linden libraries @@ -214,6 +215,10 @@ void LLInspectObject::onOpen(const LLSD& data) LLViewerObject* obj = gObjectList.findObject( mObjectID ); 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(); mObjectSelection = LLSelectMgr::instance().selectObjectAndFamily(obj); |