summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprimmediacontrols.h
diff options
context:
space:
mode:
authorleyla_linden <none@none>2010-12-31 12:55:04 -0800
committerleyla_linden <none@none>2010-12-31 12:55:04 -0800
commit350a736d37de282e1e3c22627400d957f0e00dc5 (patch)
tree7427e593ce39ad2c50e1f217bad5b211a9eb3928 /indra/newview/llpanelprimmediacontrols.h
parentd196348d0f4bd542eee3702329dab28952b8a5e5 (diff)
parente3204165b9bb9b36cb11a8d0a4a4040634e707fc (diff)
Merge
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.h')
-rw-r--r--indra/newview/llpanelprimmediacontrols.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h
index 3ec24f0e24..0b9664359c 100644
--- a/indra/newview/llpanelprimmediacontrols.h
+++ b/indra/newview/llpanelprimmediacontrols.h
@@ -29,6 +29,7 @@
#include "llpanel.h"
#include "llviewermedia.h"
+#include "llnotificationptr.h"
class LLButton;
class LLCoordWindow;
@@ -37,6 +38,7 @@ class LLLayoutStack;
class LLProgressBar;
class LLSliderCtrl;
class LLViewerMediaImpl;
+class LLWindowShade;
class LLPanelPrimMediaControls : public LLPanel
{
@@ -54,6 +56,9 @@ public:
void updateShape();
bool isMouseOver();
+ void showNotification(LLNotificationPtr notify);
+ void hideNotification();
+
enum EZoomLevel
{
ZOOM_NONE = 0,
@@ -162,6 +167,7 @@ private:
LLUICtrl *mRightBookend;
LLUIImage* mBackgroundImage;
LLUIImage* mVolumeSliderBackgroundImage;
+ LLWindowShade* mWindowShade;
F32 mSkipStep;
S32 mMinWidth;
S32 mMinHeight;
@@ -204,6 +210,8 @@ private:
S32 mZoomObjectFace;
S32 mVolumeSliderVisible;
+
+ LLNotificationPtr mActiveNotification;
};
#endif // LL_PANELPRIMMEDIACONTROLS_H