diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
commit | 57969e41db06cbc5c0f9ffdeafb7c21e55b2731d (patch) | |
tree | ea54edd04380696ef3f83671204fdae2f7ae298e /indra/newview/llviewermediafocus.cpp | |
parent | c4c537e957458650a2948ffbd3a787f007d87f7a (diff) | |
parent | eca30a22626b9a3e68e0e55f8da75614cd60d713 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
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 |