diff options
| author | callum <none@none> | 2009-10-23 17:08:36 -0700 |
|---|---|---|
| committer | callum <none@none> | 2009-10-23 17:08:36 -0700 |
| commit | 62e0e51b43418dd062c36768eef04ecead99a990 (patch) | |
| tree | 30979b37bec95dea1faa0ff7b25a756298b7adf3 /indra/newview/llviewermediafocus.cpp | |
| parent | 3008b3fdc09fce6509c6194588b65ffbf3a21925 (diff) | |
| parent | 376deff7a3c93dc162d047f54f9eed97ad2eba6a (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
| -rw-r--r-- | indra/newview/llviewermediafocus.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index cad8b5f0ce..ad48ec145b 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -77,7 +77,6 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac if (media_impl.notNull() && objectp.notNull()) { bool face_auto_zoom = false; - media_impl->focus(true); mFocusedImplID = media_impl->getMediaTextureID(); mFocusedObjectID = objectp->getID(); @@ -101,6 +100,7 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac llwarns << "Can't find media entry for focused face" << llendl; } + media_impl->focus(true); gFocusMgr.setKeyboardFocus(this); // We must do this before processing the media HUD zoom, or it may zoom to the wrong face. |