diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
| commit | 894e98a708f4135cb4543b95ce46c2b8c4929393 (patch) | |
| tree | 2055d289ca6c55eacb300feddb38b2935e8ae132 /indra/newview/llpanelprimmediacontrols.h | |
| parent | 1ca028cd7b2b4a169cdc776dfa4b38b2fcb76440 (diff) | |
| parent | 94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (diff) | |
merge changes for storm-812
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.h')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h index 0b9664359c..66956181f2 100644 --- a/indra/newview/llpanelprimmediacontrols.h +++ b/indra/newview/llpanelprimmediacontrols.h @@ -59,6 +59,7 @@ public: void showNotification(LLNotificationPtr notify); void hideNotification(); + enum EZoomLevel { ZOOM_NONE = 0, @@ -136,7 +137,11 @@ private: LLPluginClassMedia* getTargetMediaPlugin(); private: - + + void clearFaceOnFade(); + + void onMouselookModeIn(); + LLView *mMediaRegion; LLUICtrl *mBackCtrl; LLUICtrl *mFwdCtrl; @@ -185,6 +190,7 @@ private: bool mPauseFadeout; bool mUpdateSlider; bool mClearFaceOnFade; + bool mHideImmediately; LLMatrix4 mLastCameraMat; EZoomLevel mCurrentZoom; |