diff options
| author | leyla_linden <none@none> | 2011-01-10 12:10:36 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-10 12:10:36 -0800 |
| commit | b63a404613182edfd230abda595f064c7bcc1c10 (patch) | |
| tree | 18a4cb6abdfa52bb68ded012f9f4b53d491b0c48 /indra/newview/llpanelprimmediacontrols.h | |
| parent | 523722652259d37841be2ad4ad283df4887ad372 (diff) | |
| parent | fdf19a526821291bd3d6a6e1f6b78dcaeac63705 (diff) | |
Merge
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; |