diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-23 19:03:26 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-23 19:03:26 +0000 |
| commit | e19c983a119c33372ac5c8c161d563611b5a5e43 (patch) | |
| tree | 7ee3b278b04a00bfbcf66d7c3fd4df89091c1306 /indra/newview/llviewermediafocus.cpp | |
| parent | 01c7b50edbca7d397dfe5e4ba3d8b5a2e4b6780d (diff) | |
* EXT-1037 - Left-clicking anywhere in in-world area resets camera position
NOTE: Temporary fix that may break MOAP behavior. Needs to be reviewd and potentially designed.
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 |