From f1fd558dddf43277e024cb918c371d94d0764910 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Tue, 28 Dec 2010 19:02:49 +0200 Subject: STORM-714 FIXED Webprim's control bar doesn't dissapear after switching to mouselook mode - After switching to the mouse look mode hide control bar immediately, not fading it with timer - Added signal for switching mouse look mode out just for convenience. It's not used in this fix. --- indra/newview/llpanelprimmediacontrols.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelprimmediacontrols.h') 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; -- cgit v1.2.3