diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-03-20 16:34:57 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-03-20 16:34:57 +0200 |
| commit | e77e1ed8ca0a4ae34c642819fd089fa7daa67eb8 (patch) | |
| tree | e7992a57de0e169a9cb676c892a4f6de482fde8d /indra/newview/llpanelprimmediacontrols.h | |
| parent | 6c41ea62ceed90658c9d6ab6d51c5d66b8837d8c (diff) | |
SL-2222 FIXED Media Control still offers zoom out when already zoomed out
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.h')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h index 21d5236074..6256ce8411 100644 --- a/indra/newview/llpanelprimmediacontrols.h +++ b/indra/newview/llpanelprimmediacontrols.h @@ -118,6 +118,8 @@ private: void showVolumeSlider(); void hideVolumeSlider(); bool shouldVolumeSliderBeVisible(); + + bool isZoomDistExceeding(); static void onScrollUp(void* user_data); static void onScrollUpHeld(void* user_data); @@ -182,6 +184,8 @@ private: F32 mZoomMediumPadding; F32 mZoomFarPadding; S32 mTopWorldViewAvoidZone; + + LLVector3d mZoomedCameraPos; LLUICtrl *mMediaPanelScroll; LLButton *mScrollUpCtrl; |