diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-25 15:50:31 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-25 15:50:31 -0800 |
| commit | a7fde5f5304651d3afb82e5a202089d78c3c57c7 (patch) | |
| tree | 292cd809740ea6f6cc7a61230d5449c7a6dfce7f /indra/newview/llviewermediafocus.cpp | |
| parent | 3efbd20980175f6dae2cecbfbbd23bb326948189 (diff) | |
DEV-43402: Don't change the zoom level on the media controls if you click away
Review #46
This also adds a feature where llpanelprimmediacontrols remembers
the object/face that you've zoomed in on, and only switches the
zoom/unzoom icon to "unzoom" if the object/face you are hovering over
is actually the object/face you are zoomed in on
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); |