diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-01 16:43:39 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-01 16:43:39 +0200 |
| commit | 3474fc42283a0891abb1f7c8f74677921a33690f (patch) | |
| tree | 654050d93737bd66a405a0e97b60c5c50f5f5894 /indra/newview/llviewermediafocus.cpp | |
| parent | 0699c41e7c951464f759f63f43f4dea2a85ba528 (diff) | |
| parent | 8b75c2154985346317b56928276f875073d6d69f (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
| -rw-r--r-- | indra/newview/llviewermediafocus.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index fd74c9c2fc..f639c841e7 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -138,15 +138,6 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac } else { - if(mFocusedImplID.notNull()) - { - if(mMediaControls.get()) - { - // Don't reset camera zoom by default, just tell the controls they're no longer controlling zoom. - mMediaControls.get()->resetZoomLevel(false); - } - } - if(hasFocus()) { gFocusMgr.setKeyboardFocus(NULL); |