diff options
author | Merov Linden <merov@lindenlab.com> | 2011-08-02 14:41:28 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-08-02 14:41:28 -0700 |
commit | 8d081d34fc56fd1b742045dd120b6acbda0d027e (patch) | |
tree | bad359d12509e1543db1d24970f18f8ba88d01a1 /indra/newview/skins/default/xui/en | |
parent | 75d2382dc3fd1beb190eba12188883db98278f89 (diff) | |
parent | 9eb555bbe60e0f388593c489d6c473e4adcbd956 (diff) |
Sync with lindenlab/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en')
3 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml index 304987c3d5..74e01f359c 100644 --- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml @@ -15,14 +15,14 @@ layout="topleft" name="floater_sound_devices" title="Sound Devices" - width="315"> + width="490"> <panel layout="topleft" follows="all" filename="panel_sound_devices.xml" name="device_settings_panel" width="400" - left="2" + left="10" top="26" class="panel_voice_device_settings"/> <text diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index daf571297f..b6b8a337a1 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -234,7 +234,7 @@ background_visible="true" height="23" layout="topleft" mouse_opaque="false" - name="bottom_bar_ls3" + name="bottom_bar_profile_ls" left="0" orientation="horizontal" top="0" diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml index 0a20a4a965..46cbc1e87f 100644 --- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml @@ -11,6 +11,14 @@ name="default_text"> Default </panel.string> + <string + name="name_no_device"> + No Device + </string> + <string + name="name_default_system_device"> + Default System Device + </string> <icon follows="left|top" height="18" |