diff options
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
| -rw-r--r-- | indra/newview/llviewermediafocus.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index 60eabd730f..e7576d5c76 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -115,11 +115,14 @@ void LLViewerMediaFocus::setFocusFace( BOOL b, LLPointer<LLViewerObject> objectp else { gFocusMgr.setKeyboardFocus(NULL); - mFocus = NULL; if(! parcel->getMediaPreventCameraZoom()) { - gAgent.setFocusOnAvatar(TRUE, ANIMATE); + if (!mFocus->isEmpty()) + { + gAgent.setFocusOnAvatar(TRUE, ANIMATE); + } } + mFocus = NULL; // LLViewerMedia::remObserver(this, mObjectID); // Null out the media hud media pointer |