diff options
| author | Richard Linden <none@none> | 2011-06-23 10:57:41 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-23 10:57:41 -0700 |
| commit | 715cb3cc0ca968002af247d0ba67a5d3bed76756 (patch) | |
| tree | e6b72e312c2e5dcada08d7bf9294c8e18d4b6e45 /indra/newview/skins | |
| parent | c61a7fbaace20415be3003eaab95ce359ff8621a (diff) | |
| parent | 1e87fc43d7c07be618678aab6ee9f5511e593e92 (diff) | |
Automated merge with ssh://hg.lindenlab.com/leyla/viewer-experience-dd
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml index a9c7b624fd..2cb77bcdf3 100644 --- a/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml @@ -153,13 +153,6 @@ name="volume_ctrl_panel" visible="false" user_resize="false"> - <text - follows="left|top|right" - left="5" - top="14" - height="23" - name="volume_ctrl_text" - width="140">Volume Control:</text> <slider follows="top|left" height="23" @@ -169,8 +162,8 @@ min_val="0.05" name="volume_slider" show_text="false" - tool_tip="Voice volume" - top_pad="-5" + tool_tip="Call Volume" + top_pad="32" value="0.5" width="125" /> <button |