Skip to content
Snippets Groups Projects
Commit b278b61f authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1406

parents c8c93849 f70480e3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 2
− 0
View file @ b278b61f
...@@ -104,6 +104,7 @@ Alexandrea Fride ...@@ -104,6 +104,7 @@ Alexandrea Fride
STORM-255 STORM-255
STORM-960 STORM-960
STORM-1327 STORM-1327
STORM-1406
Alissa Sabre Alissa Sabre
VWR-81 VWR-81
VWR-83 VWR-83
...@@ -451,6 +452,7 @@ Jonathan Yap ...@@ -451,6 +452,7 @@ Jonathan Yap
STORM-899 STORM-899
STORM-1273 STORM-1273
STORM-457 STORM-457
STORM-1406
STORM-1327 STORM-1327
STORM-1396 STORM-1396
STORM-1292 STORM-1292
......
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+ 3
− 3
View file @ b278b61f
...@@ -385,7 +385,7 @@ ...@@ -385,7 +385,7 @@
height="18" height="18"
image_name="Move_Walk_Off" image_name="Move_Walk_Off"
layout="topleft" layout="topleft"
left_pad="170" left_pad="170"
name="avatar_icon" name="avatar_icon"
mouse_opaque="false" mouse_opaque="false"
visible="true" visible="true"
...@@ -496,8 +496,8 @@ ...@@ -496,8 +496,8 @@
filename="panel_sound_devices.xml" filename="panel_sound_devices.xml"
visiblity_control="ShowDeviceSettings" visiblity_control="ShowDeviceSettings"
name="device_settings_panel" name="device_settings_panel"
top="314" top_pad="0"
width="345" width="480"
left="18" left="18"
class="panel_voice_device_settings"/> class="panel_voice_device_settings"/>
</panel> </panel>
indra/newview/skins/default/xui/en/panel_sound_devices.xml
+ 88
− 82
View file @ b278b61f
...@@ -7,33 +7,46 @@ ...@@ -7,33 +7,46 @@
layout="topleft" layout="topleft"
name="device_settings_panel" name="device_settings_panel"
width="360"> width="360">
<panel.string <panel.string
name="default_text"> name="default_text">
Default Default
</panel.string> </panel.string>
<icon <icon
height="18" follows="left|top"
image_name="Microphone_On" height="18"
left_delta="4" image_name="Microphone_On"
name="microphone_icon" left_delta="-5"
mouse_opaque="false" name="microphone_icon"
top="7" mouse_opaque="false"
layout="topleft" top="7"
visible="true" layout="topleft"
width="18" /> visible="true"
<text width="18" />
<icon
follows="left|top"
height="18"
image_name="Parcel_Voice_Dark"
layout="topleft"
left_pad="220"
name="speaker_icon"
mouse_opaque="false"
top_delta="0"
visible="true"
width="22" />
<text
type="string" type="string"
length="1" length="1"
font.style="BOLD" font.style="BOLD"
follows="left|top" follows="left|top"
height="16" height="16"
layout="topleft" layout="topleft"
left_pad="3" left_pad="-240"
top_delta="5"
name="Input" name="Input"
width="70"> width="60">
Input Input
</text> </text>
<combo_box <combo_box
height="23" height="23"
control_name="VoiceInputAudioDevice" control_name="VoiceInputAudioDevice"
follows="left|top" follows="left|top"
...@@ -42,33 +55,57 @@ ...@@ -42,33 +55,57 @@
max_chars="128" max_chars="128"
name="voice_input_device" name="voice_input_device"
top_delta="-5" top_delta="-5"
width="200" /> width="150" />
<text <text
type="string" font.style="BOLD"
length="1" type="string"
follows="left|top" length="1"
height="16" follows="left|top"
layout="topleft" height="15"
left_delta="-70" layout="topleft"
name="My volume label" left_pad="30"
top_pad="4" name="Output"
width="200"> top_delta="5"
My volume: width="60">
</text> Output
<slider_bar </text>
control_name="AudioLevelMic" <combo_box
follows="top|right|left" control_name="VoiceOutputAudioDevice"
height="17" height="23"
increment="0.025" follows="left|top"
initial_value="1.0" layout="topleft"
layout="topleft" left_pad="0"
left_delta="-6" max_chars="128"
max_val="2" name="voice_output_device"
name="mic_volume_slider" top_delta="-4"
tool_tip="Change the volume using this slider" width="150" />
top_pad="-1" <text
width="220" /> type="string"
<text halign="left"
length="1"
follows="left|top"
height="16"
layout="topleft"
left_delta="-300"
name="My volume label"
top_pad="14"
width="200">
My volume:
</text>
<slider_bar
control_name="AudioLevelMic"
follows="top|right|left"
height="17"
increment="0.025"
initial_value="1.0"
layout="topleft"
left_delta="95"
max_val="2"
name="mic_volume_slider"
tool_tip="Change the volume using this slider"
top_pad="-18"
width="110" />
<text
type="string" type="string"
text_color="EmphasisColor" text_color="EmphasisColor"
length="1" length="1"
...@@ -79,8 +116,8 @@ ...@@ -79,8 +116,8 @@
name="wait_text" name="wait_text"
top_delta="-1" top_delta="-1"
width="110"> width="110">
Please wait Please wait
</text> </text>
<locate <locate
follows="right|top" follows="right|top"
height="20" height="20"
...@@ -121,35 +158,4 @@ ...@@ -121,35 +158,4 @@
name="bar4" name="bar4"
top_delta="0" top_delta="0"
width="20" /> width="20" />
<icon </panel>
height="18" \ No newline at end of file
image_name="Parcel_Voice_Light"
left="5"
name="speaker_icon"
mouse_opaque="false"
top_pad="3"
visible="true"
width="22" />
<text
font.style="BOLD"
type="string"
length="1"
follows="left|top"
height="15"
layout="topleft"
left_pad="0"
name="Output"
width="70">
Output
</text>
<combo_box
control_name="VoiceOutputAudioDevice"
height="23"
follows="left|top"
layout="topleft"
left_pad="0"
max_chars="128"
name="voice_output_device"
top_delta="-3"
width="200" />
</panel>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment