diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-08 09:50:04 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-08 09:50:04 -0500 |
| commit | 5dda2516ad599d3c295930fb3fc0c6cdbe8c2ce5 (patch) | |
| tree | 06d761559a50b8df3db4dffa32c6ad28ce398c11 /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | f5b82a377256d5806ec101e8a9d90533ea1a3bf9 (diff) | |
| parent | bb977a194f42cafdcf3f1245adf3b7f49857e552 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 2dc3a62637..479769ee20 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -1036,8 +1036,9 @@ void LLPanelPrimMediaControls::updateZoom() } if (zoom_padding > 0.0f) - { - LLViewerMediaFocus::setCameraZoom(getTargetObject(), mTargetObjectNormal, zoom_padding); + { + // since we only zoom into medium for now, always set zoom_in constraint to true + LLViewerMediaFocus::setCameraZoom(getTargetObject(), mTargetObjectNormal, zoom_padding, true); } // Remember the object ID/face we zoomed into, so we can update the zoom icon appropriately |