From 738192c930d8857d11ccbebaf62bffb7c48a8e2e Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 30 Nov 2009 23:38:38 +0100
Subject: Emeralds client name tag and clothing layer protection. Needs
 decision about a few things - find "Imprudence FIXME" (woq) in
 llprimitive.cpp and llvoavatar.cpp, its commented there.

	modified:   linden/indra/llprimitive/llprimitive.cpp
	modified:   linden/indra/llprimitive/llprimitive.h
	modified:   linden/indra/newview/app_settings/settings.xml
	modified:   linden/indra/newview/llagent.cpp
	modified:   linden/indra/newview/llappviewer.cpp
	modified:   linden/indra/newview/llfirstuse.cpp
	modified:   linden/indra/newview/llfirstuse.h
	modified:   linden/indra/newview/llstartup.cpp
	modified:   linden/indra/newview/llvoavatar.cpp
	modified:   linden/indra/newview/llvoavatar.h
	modified:   linden/indra/newview/skins/default/xui/en-us/notifications.xml
---
 .../newview/skins/default/xui/en-us/notifications.xml  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index e8391ba..9678e8f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6384,6 +6384,24 @@ Add this Ability to '[ROLE_NAME]'?
   </notification>
 
   <notification
+	       icon="notify.tga"
+	       name="QueryClientTags"
+	       type="notify">
+	  Would you like to have the client tag database automatically updated from modularsystems.sl?
+	  This ensures that you have the latest information available regarding other clients.
+	  <form name="form">
+		  <button
+			 index="0"
+			 name="Yes"
+			 text="Yes"/>
+		  <button
+			 index="1"
+			 name="No"
+			 text="No"/>
+	  </form>
+  </notification>
+
+  <notification
    icon="notifytip.tga"
    name="UnableToOpenCommandURL"
    priority="high"
-- 
cgit v1.1


From b7049adf59d5d874c474351a031f964d6c945fea Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 29 Dec 2009 22:48:37 +0100
Subject: added our own website to fetch the client list

	modified:   linden/indra/newview/llvoavatar.cpp
	modified:   linden/indra/newview/skins/default/xui/en-us/notifications.xml
---
 linden/indra/newview/skins/default/xui/en-us/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 9678e8f..fb5e5fd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6387,7 +6387,7 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
 	       icon="notify.tga"
 	       name="QueryClientTags"
 	       type="notify">
-	  Would you like to have the client tag database automatically updated from modularsystems.sl?
+	  Would you like to have the client tag database automatically updated from imprudenceviewer.org?
 	  This ensures that you have the latest information available regarding other clients.
 	  <form name="form">
 		  <button
-- 
cgit v1.1


From 543fbb612317e9687e2eaeb48c3346e891fc0508 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 8 Jan 2010 19:53:37 -0700
Subject: Fixed options missing from Text Chat and Input & Camera preferences
 (see VWR-13120)

---
 .../default/xui/en-us/panel_preferences_chat.xml   | 16 +++++++--------
 .../default/xui/en-us/panel_preferences_input.xml  | 23 +++++++++++++++++++++-
 2 files changed, 29 insertions(+), 10 deletions(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index e9ab27c..547b547 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -32,7 +32,7 @@
 	</text>
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
-	     enabled="true" follows="left|top" height="47" label="You" left="148"
+	     enabled="true" follows="left|top" height="56" label="You" left="148"
 	     mouse_opaque="true" name="user" width="54" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
@@ -55,7 +55,7 @@
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
 	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
 	     control_name="ObjectChatColor" enabled="true" follows="left|top"
-	     height="47"  label="Objects" left="148" mouse_opaque="true"
+	     height="56" label="Objects" left="148" mouse_opaque="true"
 	     name="objects" width="54" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
 	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
@@ -77,7 +77,7 @@
 	     enabled="true" follows="left|top" height="56"
 	     label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-28" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box3" v_pad="0" width="135">
 		Chat Console:
@@ -116,7 +116,7 @@
 	     mouse_opaque="true" name="chat_full_width_check" radio_style="false"
 	     width="239" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	      bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+	      bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">
 		Chat Options:
@@ -134,20 +134,18 @@
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
 	     name="show_timestamps_check" radio_style="false" width="237" />
-	<check_box bottom_delta="-20" enabled="true"
-  <check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" enabled="true"
+  	<check_box bottom_delta="-18" control_name="ScriptErrorsAsChat" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show script errors and warnings as regular chat" left="148"
 	     mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
 	     width="275" />
-	<check_box bottom_delta="-20" enabled="true"
 	<check_box bottom_delta="-18" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 	     label="Play typing animation when chatting" left="148" mouse_opaque="true"
 	     name="play_typing_animation" radio_style="false" width="237" />
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+  	<check_box bottom_delta="-18" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false" 
-       label="Show custom chat channel" left="148" mouse_opaque="true"
+	     label="Show custom chat channel" left="148" mouse_opaque="true"
 	     name="toggle_channel_control" radio_style="false" width="237" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 79f775b..fa4f3a5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -47,7 +47,7 @@
 	     increment=".025" initial_val="1.57" left="276" max_val="2.97" min_val=".17"
 	     mouse_opaque="true" name="camera_fov" show_text="false" value="60" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
 	     mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
 		Camera Follow Distance:
@@ -57,6 +57,27 @@
 	     increment=".025" initial_val="1" left="276" min_val=".5" max_val="3"
 	     mouse_opaque="true" name="camera_offset_scale" show_text="false" value="1"
 	     width="128" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+       mouse_opaque="true" name="Camera Transition Time:" v_pad="0" width="128">
+    Camera Transition Time:
+  </text>
+  <slider bottom_delta="-6" can_edit_text="true" decimal_digits="1"
+       enabled="true" follows="left|top" height="16" increment="0.1"
+       initial_val="0.4" left="276" max_val="4" min_val="0" mouse_opaque="true"
+       name="zoom_time" show_text="false" value="2" width="128" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+	     mouse_opaque="true" name="Camera Smoothing:" v_pad="0" width="128">
+    Camera Smoothing:
+  </text>
+  <slider bottom_delta="-6" can_edit_text="true"
+	     decimal_digits="1" enabled="true" follows="left|top" height="16"
+	     increment="0.1" initial_val="1" left="276" max_val="9" min_val="0"
+	     mouse_opaque="true" name="camera_position_smoothing" show_text="false" value="2"
+	     width="128" />
 	<check_box bottom_delta="-24" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Automatic Edit Camera Movement" left="148" mouse_opaque="true"
-- 
cgit v1.1


From 6c32b72964915fcfde21b4996ae856d490c05229 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 11 Jan 2010 01:47:28 -0700
Subject: Fixed remember password checkbox

---
 linden/indra/newview/skins/default/xui/en-us/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 6415402..e334f78 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -99,7 +99,7 @@
                select_all_on_focus_received="true" />
 	<check_box name="remember_check" label="Remember password"
              bottom_delta="-24" left_delta="0" height="16" width="140"
-             follows="left|bottom" font="SansSerifSmall" 
+             follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword" 
 	           initial_value="false" mouse_opaque="true"  />
 
 
-- 
cgit v1.1


From b203315c04220b16ab39cd4015aa888bfecb528b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 13 Jan 2010 09:34:39 -0700
Subject: Created drop-down Profile button in IM window

---
 .../default/xui/da/floater_instant_message.xml     |   2 +-
 .../default/xui/de/floater_instant_message.xml     |   2 +-
 .../default/xui/en-us/floater_instant_message.xml  |  21 +++--
 .../xui/en-us/floater_instant_message_group.xml    |   4 +-
 .../default/xui/es/floater_instant_message.xml     | 100 ++++++++++-----------
 .../default/xui/fr/floater_instant_message.xml     | 100 ++++++++++-----------
 .../default/xui/hu/floater_instant_message.xml     |   2 +-
 .../default/xui/it/floater_instant_message.xml     |   2 +-
 .../default/xui/ja/floater_instant_message.xml     |   2 +-
 .../default/xui/ko/floater_instant_message.xml     |   2 +-
 .../default/xui/pl/floater_instant_message.xml     |   2 +-
 .../default/xui/pt/floater_instant_message.xml     | 100 ++++++++++-----------
 .../default/xui/ru/floater_instant_message.xml     |   2 +-
 .../default/xui/tr/floater_instant_message.xml     |   2 +-
 .../default/xui/uk/floater_instant_message.xml     |   2 +-
 .../default/xui/zh/floater_instant_message.xml     |   2 +-
 16 files changed, 176 insertions(+), 171 deletions(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
index 13a7adf..9b695b5 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
@@ -33,7 +33,7 @@
 	<string name="unavailable_text_label">
 		Tekst chat er ikke tilgængeligt i dette opkald.
 	</string>
-	<button label="Profil..." name="profile_callee_btn"/>
+	<flyout_button label="Profil..." name="profile_callee_btn"/>
 	<button label="Opkald" name="start_call_btn" pad_right="7" width="120"/>
 	<button halign="right" label="Afbryd" name="end_call_btn" width="120"/>
 	<panel left_delta="116" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
index 667be04..1e926c4 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
@@ -33,7 +33,7 @@
 	<string name="unavailable_text_label">
 		Für diese Verbindung ist kein Text-Chat verfügbar.
 	</string>
-	<button label="Profil..." name="profile_callee_btn"/>
+	<flyout_button label="Profil..." name="profile_callee_btn"/>
 	<button label="Anrufen" name="start_call_btn" pad_right="7" width="115"/>
 	<button halign="right" label="Anruf beenden" name="end_call_btn" width="115"/>
 	<panel left_delta="111" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index be8508f..c8ec0fd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -37,20 +37,25 @@
 	<string name="unavailable_text_label">
 		Text chat is not available for this call.
 	</string>
-	<button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
-	     name="profile_callee_btn" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif"
-	     halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
-	     mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
+  <string name="history_entry">
+    History
+  </string>
+  <string name="pay_entry">
+    Pay
+  </string>
+  <string name="teleport_entry">
+    Offer Teleport
+  </string>
+  <flyout_button bottom="-40" follows="left|top" height="20" label="Profile" left="5" width="90"
+       list_position="below" mouse_opaque="true" name="profile_callee_btn">
+  </flyout_button>
 	<button bottom="-40" follows="left|top" halign="center" height="20"
 	     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-	     label="Call" left_delta="107" name="start_call_btn" width="100" />
+	     label="Call" left_delta="95" name="start_call_btn" width="100" />
 	<button bottom="-40" follows="left|top" halign="center" height="20"
 	     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
 	     label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
 	     visible="false" width="100" />
-  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="105"
-          name="history_btn" visible="true" width="85" />
   <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right" 
         text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
         bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 2e97d64..fd63221 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -45,10 +45,10 @@
 		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
 		     height="130" left="0" min_width="210" name="im_contents_panel" width="175">
 			<button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
-			     name="group_info_btn" tab_group="0" width="80" />
+			     name="group_info_btn" tab_group="0" width="90" />
 			<button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
 			     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-			     label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
+			     label="Join Call" left_delta="95" name="start_call_btn" pad_right="12"
 			     width="92" />
 			<button bottom_delta="0" follows="left|top" halign="right" height="20"
 			     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
diff --git a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
index 0ba63fc..30b23d1 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="(desconocido)" name="im_floater" title="(desconocido)">
-	<string name="ringing">
-		Llamando...
-	</string>
-	<string name="answering">
-		Conectando...
-	</string>
-	<string name="connected">
-		Conectado, pulse Colgar para acabar
-	</string>
-	<string name="hang_up">
-		Llamada finalizada
-	</string>
-	<string name="inventory_item_offered">
-		Ofrecido un ítem del inventario
-	</string>
-	<string name="voice_icon">
-		icn_voice-pvtfocus.tga
-	</string>
-	<string name="title_string">
-		Mensaje instantáneo a [NAME]
-	</string>
-	<string name="typing_start_string">
-		[NAME] está escribiendo...
-	</string>
-	<string name="session_start_string">
-		Iniciando una sesión con [NAME]; por favor, espere.
-	</string>
-	<string name="default_text_label">
-		Pulse aquí para enviar un mensaje instantáneo.
-	</string>
-	<string name="unavailable_text_label">
-		Para esta llamada no está disponible el chat de texto.
-	</string>
-	<button label="Perfil..." name="profile_callee_btn"/>
-	<button label="Llamar" name="start_call_btn"/>
-	<button label="Colgar" name="end_call_btn"/>
-	<panel name="speaker_controls">
-		<button label="" name="mute_btn" tool_tip="Silenciar la voz"/>
-	</panel>
-	<line_editor label="Pulse aquí para enviar un mensaje instantáneo" name="chat_editor"/>
-	<button label="Enviar" name="send_btn"/>
-	<string name="live_help_dialog">
-		*** Bienvenido a la Petición de Ayuda *** 
-Por favor, en primer lugar revise nuestras páginas de ayuda de SL pulsando F1, o acceda a la Knowledge Base http://secondlife.com/knowledgebase/ 
-Si no encuentra allí la respuesta que busca, por favor, empiece el proceso escribiendo su pregunta, y espere unos momentos a que responda algún ayudante que esté disponible.
--=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(desconocido)" name="im_floater" title="(desconocido)">
+	<string name="ringing">
+		Llamando...
+	</string>
+	<string name="answering">
+		Conectando...
+	</string>
+	<string name="connected">
+		Conectado, pulse Colgar para acabar
+	</string>
+	<string name="hang_up">
+		Llamada finalizada
+	</string>
+	<string name="inventory_item_offered">
+		Ofrecido un ítem del inventario
+	</string>
+	<string name="voice_icon">
+		icn_voice-pvtfocus.tga
+	</string>
+	<string name="title_string">
+		Mensaje instantáneo a [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está escribiendo...
+	</string>
+	<string name="session_start_string">
+		Iniciando una sesión con [NAME]; por favor, espere.
+	</string>
+	<string name="default_text_label">
+		Pulse aquí para enviar un mensaje instantáneo.
+	</string>
+	<string name="unavailable_text_label">
+		Para esta llamada no está disponible el chat de texto.
+	</string>
+	<flyout_button label="Perfil..." name="profile_callee_btn"/>
+	<button label="Llamar" name="start_call_btn"/>
+	<button label="Colgar" name="end_call_btn"/>
+	<panel name="speaker_controls">
+		<button label="" name="mute_btn" tool_tip="Silenciar la voz"/>
+	</panel>
+	<line_editor label="Pulse aquí para enviar un mensaje instantáneo" name="chat_editor"/>
+	<button label="Enviar" name="send_btn"/>
+	<string name="live_help_dialog">
+		*** Bienvenido a la Petición de Ayuda *** 
+Por favor, en primer lugar revise nuestras páginas de ayuda de SL pulsando F1, o acceda a la Knowledge Base http://secondlife.com/knowledgebase/ 
+Si no encuentra allí la respuesta que busca, por favor, empiece el proceso escribiendo su pregunta, y espere unos momentos a que responda algún ayudante que esté disponible.
+-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-
+	</string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
index 15539bc..926483b 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="(inconnue)" name="im_floater" title="(inconnue)">
-	<string name="ringing">
-		Appel en cours...
-	</string>
-	<string name="answering">
-		Connexion en cours...
-	</string>
-	<string name="connected">
-		Connecté(e), cliquez sur Raccrocher pour terminer l&apos;appel
-	</string>
-	<string name="hang_up">
-		Appel terminé
-	</string>
-	<string name="inventory_item_offered">
-		Objet de l&apos;inventaire offert
-	</string>
-	<string name="voice_icon">
-		icn_voice-pvtfocus.tga
-	</string>
-	<string name="title_string">
-		Envoyer un message instantané à [NAME]
-	</string>
-	<string name="typing_start_string">
-		[NAME] est en train d&apos;écrire…
-	</string>
-	<string name="session_start_string">
-		Début de la session avec [NAME], veuillez patienter.
-	</string>
-	<string name="default_text_label">
-		Cliquez ici pour envoyer un message instantané.
-	</string>
-	<string name="unavailable_text_label">
-		Le chat écrit n&apos;est pas disponible pour cet appel.
-	</string>
-	<button label="Profil..." name="profile_callee_btn"/>
-	<button label="Appeler" name="start_call_btn"/>
-	<button label="Raccrocher" name="end_call_btn"/>
-	<panel name="speaker_controls">
-		<button label="" name="mute_btn" tool_tip="Ignorez"/>
-	</panel>
-	<line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor"/>
-	<button label="Envoyer" name="send_btn"/>
-	<string name="live_help_dialog">
-		*** Bienvenue sur la page Demande d&apos;aide *** 
-Veuillez au préalable consulter les pages d&apos;aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/ 
-Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu&apos;un vous réponde. 
--=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(inconnue)" name="im_floater" title="(inconnue)">
+	<string name="ringing">
+		Appel en cours...
+	</string>
+	<string name="answering">
+		Connexion en cours...
+	</string>
+	<string name="connected">
+		Connecté(e), cliquez sur Raccrocher pour terminer l&apos;appel
+	</string>
+	<string name="hang_up">
+		Appel terminé
+	</string>
+	<string name="inventory_item_offered">
+		Objet de l&apos;inventaire offert
+	</string>
+	<string name="voice_icon">
+		icn_voice-pvtfocus.tga
+	</string>
+	<string name="title_string">
+		Envoyer un message instantané à [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] est en train d&apos;écrire…
+	</string>
+	<string name="session_start_string">
+		Début de la session avec [NAME], veuillez patienter.
+	</string>
+	<string name="default_text_label">
+		Cliquez ici pour envoyer un message instantané.
+	</string>
+	<string name="unavailable_text_label">
+		Le chat écrit n&apos;est pas disponible pour cet appel.
+	</string>
+	<flyout_button label="Profil..." name="profile_callee_btn"/>
+	<button label="Appeler" name="start_call_btn"/>
+	<button label="Raccrocher" name="end_call_btn"/>
+	<panel name="speaker_controls">
+		<button label="" name="mute_btn" tool_tip="Ignorez"/>
+	</panel>
+	<line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor"/>
+	<button label="Envoyer" name="send_btn"/>
+	<string name="live_help_dialog">
+		*** Bienvenue sur la page Demande d&apos;aide *** 
+Veuillez au préalable consulter les pages d&apos;aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/ 
+Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu&apos;un vous réponde. 
+-=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
+	</string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
index e4f5892..3469323 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
@@ -33,7 +33,7 @@
 	<string name="unavailable_text_label">
 		Szöveges üzenetküldés nem elérhető a jelenlegi hívás alatt.
 	</string>
-	<button label="Adatlap" name="profile_callee_btn"/>
+	<flyout_button label="Adatlap" name="profile_callee_btn"/>
 	<button label="Hívás" name="start_call_btn"/>
 	<button label="Hívás vége" name="end_call_btn"/>
 	<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
index 58e043f..7bdc046 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
@@ -33,7 +33,7 @@
 	<string name="unavailable_text_label">
 		La chat di testo non è disponibile in questa chiamata.
 	</string>
-	<button label="Profilo..." name="profile_callee_btn"/>
+	<flyout_button label="Profilo..." name="profile_callee_btn"/>
 	<button label="Chiama" name="start_call_btn"/>
 	<button label="Termina" name="end_call_btn"/>
 	<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
index a8e91e1..c9de54e 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
@@ -33,7 +33,7 @@
 	<string name="unavailable_text_label">
 		このコールでは文字チャットが利用できません。
 	</string>
-	<button label="プロフィール" name="profile_callee_btn" width="100"/>
+	<flyout_button label="プロフィール" name="profile_callee_btn" width="100"/>
 	<button label="コール" left_delta="105" name="start_call_btn" width="100"/>
 	<button label="呼出終了" name="end_call_btn" width="100"/>
 	<panel left_delta="96" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
index 1ad7d69..f1d0a48 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
@@ -21,7 +21,7 @@
 	<string name="default_text_label">
 		메신저를 사용하려면 여기를 클릭하십시오.
 	</string>
-	<button label="프로필" name="profile_callee_btn" />
+	<flyout_button label="프로필" name="profile_callee_btn" />
 	<button label="음성연결" name="start_call_btn" />
 	<button label="연결종료" name="end_call_btn" />
 	<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
index 2851356..1d918b8 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
@@ -33,7 +33,7 @@
 	<string name="unavailable_text_label">
 		Czat nie jest dostępny dla tej rozmowy
 	</string>
-	<button label="Profil..." name="profile_callee_btn"/>
+	<flyout_button label="Profil..." name="profile_callee_btn"/>
 	<button label="Dzwoń" name="start_call_btn"/>
 	<button label="Skończ" name="end_call_btn"/>
 	<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
index 0927cd3..983a13c 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">
-	<string name="ringing">
-		Chamando...
-	</string>
-	<string name="answering">
-		Conectando...
-	</string>
-	<string name="connected">
-		Conectado, clique Finalizar Chamada para deixar em espera
-	</string>
-	<string name="hang_up">
-		Chamada encerrada
-	</string>
-	<string name="inventory_item_offered">
-		Oferecido um item de Inventário
-	</string>
-	<string name="voice_icon">
-		icn_voice-pvtfocus.tga
-	</string>
-	<string name="title_string">
-		Mensagem Instantânea com [NAME]
-	</string>
-	<string name="typing_start_string">
-		[NAME] está digitando...
-	</string>
-	<string name="session_start_string">
-		Iniciando uma sessão com [NAME]. Por favor, aguarde.
-	</string>
-	<string name="default_text_label">
-		Clique aqui para uma mensagem instantânea.
-	</string>
-	<string name="unavailable_text_label">
-		Conversa por texto não está disponível para esta chamada.
-	</string>
-	<button label="Perfil..." name="profile_callee_btn"/>
-	<button label="Chamar" name="start_call_btn"/>
-	<button label="Terminar Chamada" name="end_call_btn"/>
-	<panel name="speaker_controls">
-		<button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
-	</panel>
-	<line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/>
-	<button label="Enviar" name="send_btn"/>
-	<string name="live_help_dialog">
-		*** Bem Vindo a Solicitação de Ajuda *** 
-Por favor, cheque primeiro nossas páginas de ajuda, pressionando F1 ou acessando a Base de Conhecimento em 
-http://secondlife.com/knowledgebase/ . Se sua resposta não está ali, por favor entre com sua pergunta e aguarde que um Ajudante responda.
--=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">
+	<string name="ringing">
+		Chamando...
+	</string>
+	<string name="answering">
+		Conectando...
+	</string>
+	<string name="connected">
+		Conectado, clique Finalizar Chamada para deixar em espera
+	</string>
+	<string name="hang_up">
+		Chamada encerrada
+	</string>
+	<string name="inventory_item_offered">
+		Oferecido um item de Inventário
+	</string>
+	<string name="voice_icon">
+		icn_voice-pvtfocus.tga
+	</string>
+	<string name="title_string">
+		Mensagem Instantânea com [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está digitando...
+	</string>
+	<string name="session_start_string">
+		Iniciando uma sessão com [NAME]. Por favor, aguarde.
+	</string>
+	<string name="default_text_label">
+		Clique aqui para uma mensagem instantânea.
+	</string>
+	<string name="unavailable_text_label">
+		Conversa por texto não está disponível para esta chamada.
+	</string>
+	<flyout_button label="Perfil..." name="profile_callee_btn"/>
+	<button label="Chamar" name="start_call_btn"/>
+	<button label="Terminar Chamada" name="end_call_btn"/>
+	<panel name="speaker_controls">
+		<button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
+	</panel>
+	<line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/>
+	<button label="Enviar" name="send_btn"/>
+	<string name="live_help_dialog">
+		*** Bem Vindo a Solicitação de Ajuda *** 
+Por favor, cheque primeiro nossas páginas de ajuda, pressionando F1 ou acessando a Base de Conhecimento em 
+http://secondlife.com/knowledgebase/ . Se sua resposta não está ali, por favor entre com sua pergunta e aguarde que um Ajudante responda.
+-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
+	</string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
index db9e975..7aa1c19 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
@@ -33,7 +33,7 @@
 	<string name="unavailable_text_label">
 		Текстовый чат недоступен для этого вызова.
 	</string>
-	<button label="Профиль..." name="profile_callee_btn"/>
+	<flyout_button label="Профиль..." name="profile_callee_btn"/>
 	<button label="Звонок" name="start_call_btn"/>
 	<button label="Конец звонка" name="end_call_btn"/>
 	<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
index d804a70..b627271 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
@@ -33,7 +33,7 @@
 	<string name="unavailable_text_label">
 		Bu arama için yazılı sohbet mevcut değil.
 	</string>
-	<button label="Profil..." name="profile_callee_btn"/>
+	<flyout_button label="Profil..." name="profile_callee_btn"/>
 	<button label="Ara" name="start_call_btn"/>
 	<button label="Kapat" name="end_call_btn"/>
 	<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
index bdd51fe..60ac3b8 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
@@ -33,7 +33,7 @@
 	<string name="unavailable_text_label">
 		Текстовий чат недоступний для цього виклику.
 	</string>
-	<button label="Профіль..." name="profile_callee_btn"/>
+	<flyout_button label="Профіль..." name="profile_callee_btn"/>
 	<button label="Дзвінок" name="start_call_btn"/>
 	<button label="Кінець дзвінка" name="end_call_btn"/>
 	<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
index 70433c1..ace6d8c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
@@ -30,7 +30,7 @@
 	<string name="unavailable_text_label">
 		本次通话不可以文字聊天。
 	</string>
-	<button label="档案..." name="profile_callee_btn"/>
+  <flyout_button label="档案..." name="profile_callee_btn"/>
 	<button label="呼叫" name="start_call_btn"/>
 	<button label="结束呼叫" name="end_call_btn" pad_right="10" visible="false"/>
 	<panel name="speaker_controls">
-- 
cgit v1.1


From a8c11186e98ec4b0c22f7fd045a7d7f6b6a67a72 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 14 Jan 2010 13:37:40 -0700
Subject: Removed unnecessary xui files from silver skin

---
 linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml   | 2 +-
 linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index d31357f..569e421 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -726,7 +726,7 @@ Only large parcels can be listed in search.
 			</combo_box>
 			<button bottom="-140" enabled="true" follows="left|top" font="SansSerif"
 			     halign="center" height="18" label="?" label_selected="?" left="400"
-			     mouse_opaque="true" name="?" width="18" />
+			     mouse_opaque="true" name="?" width="20" />
 			<check_box bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
 			     height="16" initial_value="false" label="Mature Content" left="14"
 			     mouse_opaque="true" name="MatureCheck" radio_style="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
index 68443c5..e2bafbf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
@@ -62,5 +62,5 @@
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
 	     label="Advanced Water" left="300" name="EnvAdvancedWaterButton" width="137" />
 	<button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
-	     left="570" name="EnvSettingsHelpButton" width="18" />
+	     left="570" name="EnvSettingsHelpButton" width="22" />
 </floater>
-- 
cgit v1.1