diff options
| author | Richard Linden <none@none> | 2011-04-01 18:23:13 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-01 18:23:13 -0700 |
| commit | 80efbeead1d59b64b615f8a33cb0966cf7fef9f1 (patch) | |
| tree | de2ce8d48ba15af62a15800355bf7d51aab659b0 /indra/newview/llviewermediafocus.cpp | |
| parent | 1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (diff) | |
| parent | 81ae3c5fc984a5175f1bd0fc277f8493dc895d94 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
| -rw-r--r-- | indra/newview/llviewermediafocus.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index de52aa17d1..4543a1ba9a 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -113,6 +113,11 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac media_impl->focus(true); gFocusMgr.setKeyboardFocus(this); + LLViewerMediaImpl* impl = getFocusedMediaImpl(); + if (impl) + { + LLEditMenuHandler::gEditMenuHandler = impl; + } // We must do this before processing the media HUD zoom, or it may zoom to the wrong face. update(); @@ -139,6 +144,13 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac { gFocusMgr.setKeyboardFocus(NULL); } + + LLViewerMediaImpl* impl = getFocusedMediaImpl(); + if (LLEditMenuHandler::gEditMenuHandler == impl) + { + LLEditMenuHandler::gEditMenuHandler = NULL; + } + mFocusedImplID = LLUUID::null; if (objectp.notNull()) |