summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprimmediacontrols.h
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2009-12-18 17:41:01 +0200
committerIgor Borovkov <iborovkov@productengine.com>2009-12-18 17:41:01 +0200
commit5dfc8d4c84d2f3d14b08988f2af4e5b14fc47a72 (patch)
tree3d757eca2107a93db7ad6d87b9b5068d90d566d9 /indra/newview/llpanelprimmediacontrols.h
parentf7fadaa807a0652df1da41ac69ab069273605965 (diff)
parenta09c2ba7ac798386b462745774d01c75102beaaf (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.h')
-rw-r--r--indra/newview/llpanelprimmediacontrols.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h
index 17e65b8b0c..d899ee4473 100644
--- a/indra/newview/llpanelprimmediacontrols.h
+++ b/indra/newview/llpanelprimmediacontrols.h
@@ -110,6 +110,7 @@ private:
void onCommitVolumeSlider();
void onToggleMute();
void showVolumeSlider();
+ void hideVolumeSlider();
static void onScrollUp(void* user_data);
static void onScrollUpHeld(void* user_data);
@@ -204,7 +205,7 @@ private:
LLUUID mZoomObjectID;
S32 mZoomObjectFace;
- bool mVolumeSliderVisible;
+ S32 mVolumeSliderVisible;
};
#endif // LL_PANELPRIMMEDIACONTROLS_H