summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llstatusbar.cpp5
-rw-r--r--indra/newview/skins/default/xui/en/panel_volume_pulldown.xml4
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 2bd8d5fa55..8289930d97 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -512,8 +512,9 @@ static void onClickVolume(void* data)
// toggle the master volume pull-down
//LLFloaterReg::showInstance("volume_pulldown"); //tmp
- //LLPanelVolumePulldown *foo=
- new LLPanelVolumePulldown();
+ LLPanelVolumePulldown *foo=
+ new LLPanelVolumePulldown();
+ foo->setVisible(TRUE);
}
// 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 289cdbc821..8c12fd1fb4 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -19,14 +19,14 @@
initial_value="0.5"
layout="topleft"
left="0"
- name="xSystem Volume"
+ name="System Volume"
show_text="false"
slider_label.halign="right"
top_pad="5"
volume="true"
width="120">
<slider.commit_callback
- function="Pref.setControlFalse"
+ function="Vol.setControlFalse"
parameter="MuteAudio" />
</slider>
</panel>