From 6512d9f69d541b8f731a1b98198a7f8b0df07442 Mon Sep 17 00:00:00 2001 From: SignpostMarv Martin Date: Wed, 22 Dec 2010 19:41:59 +0000 Subject: Constraints in XUI files don't match the constraints imposed elsewhere in the viewer/server code. Don't know where the constraints are specified, but this XUI mod lets the user play within the full range of the actual constraints. --- indra/newview/skins/default/xui/en/floater_tools.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index e70e1eb61b..f65082bd8c 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1829,26 +1829,26 @@ even though the user gets a free copy. -- cgit v1.2.3 From 368173b7d602aa1d790a4510c4bf9e6d9e102d1d Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Fri, 22 Apr 2011 18:52:22 -0700 Subject: EXP-749 [REGRESSION] Voice status indicator shown in IM session instead of profile pic in Basic and Advanced modes --- indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml index 99807d4717..d27c14f4e7 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml @@ -21,6 +21,7 @@ width="20" /> Date: Wed, 27 Apr 2011 16:45:33 -0700 Subject: EXP-670 Voice for basic mode reviewed by Merov http://codereview.lindenlab.com/6231263/ --- .../default/xui/en/panel_preferences_sound.xml | 171 ++------------------- 1 file changed, 10 insertions(+), 161 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index 26af8dc29d..a314e0d85e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -466,164 +466,13 @@ name="device_settings_btn" width="190"> - - - Default - - - Default system device - - - No device - - - - Input - - - - My volume: - - - - Please wait - - - - - - - - - Output - - - - + + -- cgit v1.2.3 From 892c5109e8679ca28a53799289732efcbebd9d48 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Wed, 27 Apr 2011 16:45:57 -0700 Subject: EXP-670 Voice for basic mode new files reviewed by merov --- .../skins/default/xui/en/floater_sound_devices.xml | 28 ++++ .../skins/default/xui/en/panel_sound_devices.xml | 163 +++++++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 indra/newview/skins/default/xui/en/floater_sound_devices.xml create mode 100644 indra/newview/skins/default/xui/en/panel_sound_devices.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml new file mode 100644 index 0000000000..3c9e5aeff3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml @@ -0,0 +1,28 @@ + + + + diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml new file mode 100644 index 0000000000..9812281323 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml @@ -0,0 +1,163 @@ + + + Default + + + Default system device + + + No device + + + + Input + + + + My volume: + + + + Please wait + + + + + + + + + Output + + + -- cgit v1.2.3 From 0453808465aa91d71f7dfd944003d81a523d92d6 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Wed, 27 Apr 2011 17:41:49 -0700 Subject: Fixed floater sound devices title --- indra/newview/skins/default/xui/en/floater_sound_devices.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui') 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 3c9e5aeff3..584413c030 100644 --- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml @@ -14,7 +14,7 @@ height="140" layout="topleft" name="floater_sound_devices" - title="Sound Devicess" + title="Sound Devices" width="315"> Date: Fri, 29 Apr 2011 15:54:45 -0700 Subject: EXP-742 FIX [PUBLIC] CTRL-ALT-w doesn't "spin_over" --- indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 51610c0ae0..81b7d35253 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2696,7 +2696,7 @@ + shortcut="control|shift|Z"> -- cgit v1.2.3 From 814e540e85d0f8dc3b50ade6b1b3194e7cbb57fb Mon Sep 17 00:00:00 2001 From: callum Date: Mon, 2 May 2011 13:40:41 -0700 Subject: EXP-743 FIX Side bar panel is visible on login screen after getting 'We're having trouble connecting' message --- indra/newview/skins/default/xui/en/main_view.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index e5ae0b950a..3ead67ca57 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -8,12 +8,6 @@ tab_stop="false" name="main_view" width="1024"> - - + + + + Date: Mon, 2 May 2011 16:11:46 -0700 Subject: Backed out changeset: d38e4f4982a0 --- .../skins/default/xui/en/panel_bottomtray.xml | 676 ++++++++++----------- 1 file changed, 338 insertions(+), 338 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index a6e5e7a219..57a22037cd 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -13,31 +13,31 @@ top="28" width="1310"> + name="DragIndicationImageName" + value="Accordion_ArrowOpened_Off" /> + name="SpeakBtnToolTip" + value="Turns microphone on/off" /> + name="VoiceControlBtnToolTip" + value="Shows/hides voice control panel" /> + mouse_opaque="false" + name="toolbar_stack" + orientation="horizontal" + top="0" + width="1310"> + auto_resize="false" + user_resize="false" + min_width="2" + width="2" /> - + - - - - - - - - - - - - - - - - + chiclet_padding="4" + follows="left|right" + height="24" + layout="topleft" + left="1" + min_width="95" + mouse_opaque="false" + name="chiclet_list" + top="7" + width="189"> + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="37" + name="notification_well_panel" + top="0" + user_resize="false" + width="37"> + follows="right" + height="23" + layout="topleft" + left="0" + max_displayed_count="99" + name="notification_well" + top="5" + width="35"> + auto_resize="false" + user_resize="false" + min_width="4" + name="DUMMY2" + width="8" /> -- cgit v1.2.3 From 5b29bd3660852cdca3416ba779fbfdc032f8f222 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Mon, 2 May 2011 17:12:16 -0700 Subject: sync up with viewer-development --- .../skins/default/xui/en/widgets/avatar_icon.xml | 1 + .../skins/default/xui/en/widgets/scroll_bar.xml | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml index a1e32e44de..4d69dda7eb 100644 --- a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml @@ -1,6 +1,7 @@ diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml index 830ea12e41..e6d4bff8b5 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml @@ -6,20 +6,24 @@ track_color="ScrollbarTrackColor" thumb_color="ScrollbarThumbColor" thickness="15"> - - - - + -- cgit v1.2.3 From 6431f7fb287d357f9800aac7ce5496c7a7cd063f Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Mon, 2 May 2011 17:14:53 -0700 Subject: WIP VWR-25074 add missing string in English, pending actual Danish translation --- indra/newview/skins/default/xui/da/notifications.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index a3c4897ee1..376538872f 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -748,6 +748,7 @@ Prøv venligst igen senere. [OLD_NAME] ([SLID]) er nu kendt som [NEW_NAME]. + Offer a teleport to your location with the following message?
Mød mig i [REGION] -- cgit v1.2.3 From 76221ab9b3d5e4a185dfdfeb39719724739566ab Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Tue, 3 May 2011 11:55:21 -0700 Subject: FIX VWR-25074 add missing Danish translation --- indra/newview/skins/default/xui/da/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 376538872f..30b54d3eb2 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -748,7 +748,7 @@ Prøv venligst igen senere. [OLD_NAME] ([SLID]) er nu kendt som [NEW_NAME]. - Offer a teleport to your location with the following message? + Tilbyd en teleport til din position med følgende besked? Mød mig i [REGION] -- cgit v1.2.3 From af6a5b1f40ff0f0a8f0d10f609fa27da7e40959d Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Tue, 3 May 2011 16:37:12 -0700 Subject: FIX VWR-22337 translation (in utf-8) for "loading terms of service" string --- indra/newview/skins/default/xui/da/floater_tos.xml | 2 +- indra/newview/skins/default/xui/de/floater_tos.xml | 2 +- indra/newview/skins/default/xui/es/floater_tos.xml | 2 +- indra/newview/skins/default/xui/fr/floater_tos.xml | 2 +- indra/newview/skins/default/xui/pl/floater_tos.xml | 2 +- indra/newview/skins/default/xui/pt/floater_tos.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml index 760f60c996..af9ee0bd06 100644 --- a/indra/newview/skins/default/xui/da/floater_tos.xml +++ b/indra/newview/skins/default/xui/da/floater_tos.xml @@ -4,7 +4,7 @@ http://secondlife.com/app/tos/ - data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E + data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Henter %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E - - Default - - - Default system device - - - No device - - - - Input - - - - My volume: - - - - Please wait - - - - - - - - - Output - - - + top="314" + width="345" + left="18" + class="panel_voice_device_settings"/> diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml new file mode 100644 index 0000000000..9812281323 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml @@ -0,0 +1,163 @@ + + + Default + + + Default system device + + + No device + + + + Input + + + + My volume: + + + + Please wait + + + + + + + + + Output + + + diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml index 99807d4717..d27c14f4e7 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml @@ -21,6 +21,7 @@ width="20" /> Date: Thu, 12 May 2011 18:17:35 -0700 Subject: WIP VWR-23688 adding es and pt missing translation; add 1 zh file for testing Traditional Chinese as a new language --- indra/newview/skins/default/xui/es/strings.xml | 3 ++ indra/newview/skins/default/xui/pt/strings.xml | 3 ++ indra/newview/skins/default/xui/zh/panel_login.xml | 41 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 indra/newview/skins/default/xui/zh/panel_login.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 75126e74c5..5a913c4c9d 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -3588,6 +3588,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. Conferencia con [AGENT_NAME] + + Ofrecido el item del inventario + (La sesión de MI no existe) diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 6466f42c75..1dbbcafb0e 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -3587,6 +3587,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Conversa com [AGENT_NAME] + + Oferta de item de inventário + (Sessão de MI inexistente) diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml new file mode 100644 index 0000000000..9d094ff731 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_login.xml @@ -0,0 +1,41 @@ + + + + + + 使用者名稱: + + + 密碼: + + +