diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-23 17:52:37 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-23 17:52:37 +0000 |
| commit | 655f33a9f818d75dd0f8d6040dfffd0520344222 (patch) | |
| tree | 98f7914b57f8979e7c0e412cc239cd96614bf4fc /indra/newview | |
| parent | afd81a7d742731188f91f4b247abfc69813a95be (diff) | |
panelized volume pulldown, that doesn't work at all.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_volume_pulldown.xml | 24 |
2 files changed, 7 insertions, 23 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index bc9edec0ba..2bd8d5fa55 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -42,6 +42,7 @@ #include "llfloaterbuycurrency.h" #include "llfloaterchat.h" #include "llfloaterlagmeter.h" +#include "llfloatervolumepulldown.h" #include "llfloaterregioninfo.h" #include "llfloaterscriptdebug.h" #include "llhudicon.h" @@ -201,7 +202,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect) addChild(mSGPacketLoss); childSetActionTextbox("stat_btn", onClickStatGraph); - } LLStatusBar::~LLStatusBar() @@ -511,7 +511,9 @@ static void onClickVolume(void* data) gSavedSettings.setBOOL("MuteAudio", !mute_audio); // toggle the master volume pull-down - LLFloaterReg::showInstance("volume_pulldown"); //tmp + //LLFloaterReg::showInstance("volume_pulldown"); //tmp + //LLPanelVolumePulldown *foo= + new LLPanelVolumePulldown(); } // sets the static variables necessary for the date diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml index 5d731663cb..289cdbc821 100644 --- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml @@ -1,23 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - background_opaque="false" - border_visible="false" - background_visible="true" - bg_alpha_color="0.3 0.3 0.3 0" - bg_opaque_color="0.3 0.3 0.3 0" - - legacy_header_height="0" - can_dock="false" - can_minimize="false" - can_close="false" - follows="bottom" - height="52" - layout="topleft" - name="volumepulldown_floater" - save_rect="false" - save_visibility="false" - width="152"> - <panel +<panel + chrome="true" border="false" follows="all" height="50" @@ -46,5 +29,4 @@ function="Pref.setControlFalse" parameter="MuteAudio" /> </slider> - </panel> -</floater> +</panel> |