diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-07 10:14:33 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-07 10:14:33 -0500 |
| commit | 61e3c95dbf8282dbce5455a7adc466d9c2108a13 (patch) | |
| tree | 1d7f029348b6a5c5c66413d00898190fc338e8c2 /indra/newview/llpanelprimmediacontrols.h | |
| parent | 38ab28511473fb6882bab0d5a1ce3f372c48a171 (diff) | |
| parent | 09c01c4e925833873a83665fe0642637b65e547e (diff) | |
Automated merge up from viewer-development
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; |