summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermediafocus.cpp
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-02-24 18:46:52 -0800
committerEli Linden <eli@lindenlab.com>2010-02-24 18:46:52 -0800
commitf71098a4065896bd69fcfe55c83dd3a562a7ac64 (patch)
treec40d665ec2082164bcaa819a01a786e0f15d31da /indra/newview/llviewermediafocus.cpp
parentcea0bac85cf360f7e2818796585dc9ec49359adc (diff)
parentfadbd33b52b6deb465a49a4c0857ed8078277b15 (diff)
Merge
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
-rw-r--r--indra/newview/llviewermediafocus.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index 88e7cfec86..b8179f7fc2 100644
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -126,7 +126,7 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac
if(face_auto_zoom && ! parcel->getMediaPreventCameraZoom())
{
// Zoom in on this face
- mMediaControls.get()->resetZoomLevel();
+ mMediaControls.get()->resetZoomLevel(false);
mMediaControls.get()->nextZoomLevel();
}
else