diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-25 15:50:58 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-25 15:50:58 -0800 |
| commit | 6824800fa0001cd4a23a4f98b099af34435b0e06 (patch) | |
| tree | 37322ee3d26f083ee04d2582d424608241c51b93 /indra/newview/llviewermediafocus.cpp | |
| parent | a4f8fb48fc0a2b91abfb5f732669f0ece2dfb1b7 (diff) | |
| parent | a7fde5f5304651d3afb82e5a202089d78c3c57c7 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
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); |