diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-05 16:46:49 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-05 16:46:49 -0800 |
| commit | 617a7a0ebdd47aeea578456f4ed0d91ab8582a0b (patch) | |
| tree | cab0a9a66922b592d0bcb927b8b06eb8b9c28707 /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 124c5359891152da8aaed4e856e20595d3414ab3 (diff) | |
EXT-4102 [BSI] auto zoom on media prims push camera away when zoomed in and clicking
reviewed by Rick
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 |