summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-30 15:22:16 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-30 15:22:16 +0000
commit903de794d2ce610be775cf44453643f8419447ef (patch)
tree83756e7c2fe433f37a221975412069c3f2bd58ea /indra
parent1b055428bb6c2f7f9868277926d8b751fbc08145 (diff)
pretty good volume bar appear-on-hover
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llstatusbar.cpp12
-rw-r--r--indra/newview/llstatusbar.h1
2 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index d57564a9f0..04b96a3a01 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -161,6 +161,7 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
mBtnVolume = getChild<LLButton>( "volume_btn" );
mBtnVolume->setClickedCallback( onClickVolume, this );
+ mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this));
mPanelVolume = getChild<LLPanelVolumePulldown>( "volume_pulldown" );
@@ -508,6 +509,17 @@ static void onClickScriptDebug(void*)
LLFloaterScriptDebug::show(LLUUID::null);
}
+//static
+void LLStatusBar::onMouseEnterVolume(LLUICtrl* ctrl)
+{
+#if 1
+ //LLFloater* vp =
+ LLFloaterReg::showInstance("volume_pulldown"); //tmp
+#else
+ #error do this for panel
+#endif
+}
+
static void onClickVolume(void* data)
{
// toggle the master mute setting
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index acb211b738..347530806e 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -95,6 +95,7 @@ private:
void onVolumeChanged(const LLSD& newvalue);
+ static void onMouseEnterVolume(LLUICtrl* ctrl);
static void onClickStatGraph(void* data);
private: