diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-02-16 15:42:33 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-16 15:42:33 -0800 |
commit | 0e234edcc67ecf534df15f088158ef236f6de102 (patch) | |
tree | 9013ecc90f0fde4e87f45c44d27b73f5197a1911 /indra/newview/llpanelprimmediacontrols.h | |
parent | c6a8d9a7e71a22290ac8db63828f3c6fdd018ffd (diff) |
EXT-5270: Implement "dynamic" controls based on the selected item in Nearby Media
Review #112
This change adds controls that change state based on the selection in the nearby media panel. There are basically 3 sets:
- Time-based
- Web-based ("Normal")
- Disabled
Again, these change based on what you've got selected in the panel
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.h')
-rw-r--r-- | indra/newview/llpanelprimmediacontrols.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h index 743cec70a1..2e0de7866c 100644 --- a/indra/newview/llpanelprimmediacontrols.h +++ b/indra/newview/llpanelprimmediacontrols.h @@ -58,6 +58,16 @@ public: void updateShape(); bool isMouseOver(); + + enum EZoomLevel + { + ZOOM_NONE = 0, + ZOOM_FAR, + ZOOM_MEDIUM, + ZOOM_NEAR + }; + + EZoomLevel getZoomLevel() const { return mCurrentZoom; } void nextZoomLevel(); void resetZoomLevel(bool reset_camera = true); void close(); @@ -66,13 +76,6 @@ public: void setMediaFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal = LLVector3::zero); - enum EZoomLevel - { - ZOOM_NONE = 0, - ZOOM_FAR, - ZOOM_MEDIUM, - ZOOM_NEAR - }; static const EZoomLevel kZoomLevels[]; static const int kNumZoomLevels; |