diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-06 16:19:30 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-06 16:19:30 -0500 |
| commit | 327069dcb8d71e2fb603c0ddf505d692de64e461 (patch) | |
| tree | a39d7c61820f98d176d8fb2136eb7a898f840412 /indra/newview/llinspectobject.cpp | |
| parent | 703694d1da6c413947657f43c1e61f7065b5101f (diff) | |
| parent | 7586d8fcfde811cb04fb1c95aa0aa235b8df6aff (diff) | |
merge
Diffstat (limited to 'indra/newview/llinspectobject.cpp')
| -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); |