From 0758eab5e62897297d6d16feea37df2c84c3aa1a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 16 Apr 2010 14:41:26 -0700
Subject: Backed out changeset: 61a83065d146

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 8c7de22cf8..84664eedcc 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -99,7 +99,7 @@
      image_pressed="Pause_Press"
      image_pressed_selected="Play_Press"
      is_toggle="true"
-     left_pad="20"
+     left_pad="15"
      top="1"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"
@@ -112,12 +112,12 @@
      image_pressed="Audio_Press"
      image_unselected="Audio_Off"
      is_toggle="true"
-     left_pad="10"
+     left_pad="5"
      top="2"
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
-  <!--  <text
+    <text
      follows="right|top"
      halign="center"
      height="12"
@@ -125,5 +125,5 @@
      left_delta="0"
      name="stat_btn"
      top_delta="0"
-     width="20"/>-->
+     width="20"/>
 </panel>
-- 
cgit v1.2.3


From 5a5380a65e05db01ef0fa416d098d600f3da41fc Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 6 Apr 2010 20:28:29 +0300
Subject: Fixed major bug EXT-6572 (EXT-6572 ([VARIABLE IN WRONG PLACE] in
 Taskbar \"Kaufen L$\" should be \"L$ kaufen\")

- Removed the L$ graphic and made \"L$\" part of the label string.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/172/
(transplanted from 4cbdcfc8b196f0ff28df1d0897023ee967cce2a3)
---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 84664eedcc..690d2971ee 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -62,11 +62,11 @@
      halign="right"
      font="SansSerifSmall"
      follows="right|top"
-     image_selected="BuyArrow_Over"
-     image_unselected="BuyArrow_Over"
-     image_pressed="BuyArrow_Press"
+     image_selected="spacer35.tga"
+     image_unselected="spacer35.tga"
+     image_pressed="spacer35.tga"
      height="16"
-     label="Buy"
+     label="Buy L$"
      label_color="EmphasisColor"
      left_pad="0"
      label_shadow="false"
-- 
cgit v1.2.3


From bd6e166a6653ac71a110d6fe353aa58f49e4a6d0 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 15 Apr 2010 11:09:04 -0700
Subject: EXT-6861 partial fix by restoring the "Buy" word. Complete fix
 pending next l10n cycle; DE linguistic

---
 indra/newview/skins/default/xui/de/notifications.xml    | 2 +-
 indra/newview/skins/default/xui/de/panel_status_bar.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index c2f25c84b8..97387e9e87 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -1725,7 +1725,7 @@ Inventarobjekt(e) verschieben?
 	<notification name="ClickActionNotPayable">
 		Achtung: Die Klickaktion „Objekt bezahlen&quot; wurde eingestellt. Diese funktioniert jedoch nicht, wenn ein Skript mit einer Geldtransaktion () hinzugefügt wird.
 		<form name="form">
-			<ignore name="ignore" text="I habe die Aktion „Objekt bezahlen&quot; eingestellt, während ich ein Objekt gebaut habe, dass kein Geld()-Skript enthält."/>
+			<ignore name="ignore" text="Ich habe die Aktion „Objekt bezahlen&quot; eingestellt, während ich ein Objekt gebaut habe, dass kein Geld()-Skript enthält."/>
 		</form>
 	</notification>
 	<notification name="OpenObjectCannotCopy">
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 803bd1b5ab..0e182fa417 100644
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		[AMT] L$
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="Mein Kontostand"/>
-	<button label=" " name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
+	<button label="Kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
 	<text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
 		24:00 H PST
 	</text>
-- 
cgit v1.2.3


From eea0ba834b900588d03d109c93a1bb756dbce2fb Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 16 Apr 2010 16:54:07 -0700
Subject: EXT-6572 correct translation for "Buy L$", for 2.0.1

---
 indra/newview/skins/default/xui/da/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/de/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/es/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/fr/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/it/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/ja/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/pl/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/pt/panel_status_bar.xml | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml
index 4618fe536d..08ffafd5a6 100644
--- a/indra/newview/skins/default/xui/da/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		L$ [AMT]
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="Min balance"/>
-	<button label="Køb" name="buyL" tool_tip="Klik for at købe flere L$"/>
+	<button label="Køb L$" name="buyL" tool_tip="Klik for at købe flere L$"/>
 	<text name="TimeText" tool_tip="Nuværende tid (Pacific)">
 		24:00 PST
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 803bd1b5ab..3dc6997320 100644
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		[AMT] L$
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="Mein Kontostand"/>
-	<button label=" " name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
+	<button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
 	<text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
 		24:00 H PST
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index 1afa68106e..d4404fd9b5 100644
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		[AMT] L$
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="Mi saldo"/>
-	<button label="Comprar" name="buyL" tool_tip="Pulsa para comprar más L$"/>
+	<button label="Comprar L$" name="buyL" tool_tip="Pulsa para comprar más L$"/>
 	<text name="TimeText" tool_tip="Hora actual (Pacífico)">
 		24:00 AM PST
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index 657bf792cf..dffb1d4238 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		[AMT] L$
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="Mon solde"/>
-	<button label="Acheter" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/>
+	<button label="Acheter L$" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/>
 	<text name="TimeText" tool_tip="Heure actuelle (Pacifique)">
 		00h00 PST
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml
index 584ac5e4b4..4c860ff479 100644
--- a/indra/newview/skins/default/xui/it/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		L$ [AMT]
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="Il mio saldo"/>
-	<button label="Acquista" name="buyL" tool_tip="Clicca per comprare più L$"/>
+	<button label="Acquista L$" name="buyL" tool_tip="Clicca per comprare più L$"/>
 	<text name="TimeText" tool_tip="Orario attuale (Pacifico)">
 		24:00, ora del Pacifico
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 923455abba..8a848f496d 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		L$ [AMT]
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="所持金"/>
-	<button label="購入" name="buyL" tool_tip="クリックして L$ を購入します"/>
+	<button label="L$ の購入" name="buyL" tool_tip="クリックして L$ を購入します"/>
 	<text name="TimeText" tool_tip="現在時刻（太平洋）">
 		24:00 AM PST
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
index cd2ae14f6c..313c2732ff 100644
--- a/indra/newview/skins/default/xui/pl/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		L$ [AMT]
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="Bilans"/>
-	<button label="Kup" name="buyL" tool_tip="Kliknij aby kupić L$"/>
+	<button label="Kup L$" name="buyL" tool_tip="Kliknij aby kupić L$"/>
 	<text name="TimeText" tool_tip="Obecny Czas (Pacyficzny)">
 		24:00 AM PST
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index ae2879f4a9..a320d9d56d 100644
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		L$ [AMT]
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="Meu saldo"/>
-	<button label="Comprar" name="buyL" tool_tip="Comprar mais L$"/>
+	<button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/>
 	<text name="TimeText" tool_tip="Hora atual (Pacífico)">
 		24:00 AM PST
 	</text>
-- 
cgit v1.2.3


From c367c3d1d5a889f7fc08e2414400f67cf84b80e6 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 15 Apr 2010 12:30:19 -0700
Subject: VWR-18616 shorter ES xl

---
 indra/newview/skins/default/xui/es/floater_about_land.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index 49bf2a7442..6118a63872 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -264,7 +264,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 				[COUNT]
 			</text>
 			<text left="4" name="Autoreturn" width="412">
-				Devolución automática de objetos de otros (en min., 0 para desactivarla):
+				Devolución automát. de objetos de otros (en min., 0 la desactiva):
 			</text>
 			<line_editor name="clean other time" right="-20"/>
 			<text name="Object Owners:" width="150">
@@ -275,7 +275,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<name_list name="owner list">
 				<name_list.columns label="Tipo" name="type"/>
 				<name_list.columns label="Nombre" name="name"/>
-				<name_list.columns label="Número" name="count"/>
+				<name_list.columns label="Núm." name="count"/>
 				<name_list.columns label="Más recientes" name="mostrecent"/>
 			</name_list>
 		</panel>
-- 
cgit v1.2.3


From 5b64be097f319d7d2f20e0b1fd803a3644544dc3 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 15 Apr 2010 14:12:17 -0700
Subject: EXT-6879 remove 'it' overrides

---
 indra/newview/skins/default/xui/it/panel_group_roles.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml
index ef6f85390a..1769ef748d 100644
--- a/indra/newview/skins/default/xui/it/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_roles.xml
@@ -6,23 +6,23 @@
 	<panel.string name="want_apply_text">
 		Vuoi salvare le modifiche?
 	</panel.string>
-	<tab_container height="164" name="roles_tab_container">
-		<panel height="148" label="MEMBRI" name="members_sub_tab" tool_tip="Membri">
+	<tab_container name="roles_tab_container">
+		<panel label="MEMBRI" name="members_sub_tab" tool_tip="Membri">
 			<panel.string name="help_text">
 				Puoi aggiungere o rimuovere i ruoli assegnati ai membri. 
 Seleziona più membri tenendo premuto il tasto Ctrl e 
 cliccando sui loro nomi.
 			</panel.string>
 			<filter_editor label="Filtra Membri" name="filter_input"/>
-			<name_list bottom_delta="-105" height="104" name="member_list">
+			<name_list name="member_list">
 				<name_list.columns label="Socio" name="name"/>
 				<name_list.columns label="Donazioni" name="donated"/>
 				<name_list.columns label="Stato" name="online"/>
 			</name_list>
-			<button label="Invita" name="member_invite" width="165"/>
+			<button label="Invita" name="member_invite"/>
 			<button label="Espelli" name="member_eject"/>
 		</panel>
-		<panel height="148" label="RUOLI" name="roles_sub_tab">
+		<panel label="RUOLI" name="roles_sub_tab">
 			<panel.string name="help_text">
 				I ruoli hanno un titolo con un elenco di abilità permesse
 che i membri possono eseguire. I membri possono avere
@@ -36,7 +36,7 @@ fra cui il ruolo base o &quot;Tutti&quot; e il ruolo del Proprietario, ovvero il
 				Inv_FolderClosed
 			</panel.string>
 			<filter_editor label="Filtra i ruoli" name="filter_input"/>
-			<scroll_list bottom_delta="-104" height="104" name="role_list">
+			<scroll_list name="role_list">
 				<scroll_list.columns label="Ruolo" name="name"/>
 				<scroll_list.columns label="Titolo" name="title"/>
 				<scroll_list.columns label="#" name="members"/>
-- 
cgit v1.2.3


From c0ad2a55bac2f974876432f7e8ec11cc9d1b05a6 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 16 Apr 2010 09:14:45 +0300
Subject: Fixed EXT-6862(normal) - Offer Teleport button is offset to far to
 the right Reverted Eli's fix 11355 : a55a8ed85023 (VWR-17833 en_xui_change to
 cover PT (logest translation)) Fixed buttons width in Friends tab in Polish
 localization. Also fixed group tab buttons.

Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/247/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.xml |  2 +-
 indra/newview/skins/default/xui/pl/panel_people.xml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 233137a76b..8131b75b70 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -477,7 +477,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
          label="Share"
          layout="topleft"
          name="share_btn"
-         width="85" />
+         width="62" />
         <button
          follows="bottom|left"
          left_pad="3"
diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml
index 5ea5356c60..09958c84d6 100644
--- a/indra/newview/skins/default/xui/pl/panel_people.xml
+++ b/indra/newview/skins/default/xui/pl/panel_people.xml
@@ -47,13 +47,13 @@ Jeżeli szukasz ludzi, z którymi można się spotkać, kliknij tutaj [secondlif
 		</panel>
 	</tab_container>
 	<panel name="button_bar">
-		<button label="Profil" name="view_profile_btn" tool_tip="Pokaż zdjęcie, grupy i inne informacje o Rezydencie"/>
-		<button label="IM" name="im_btn" tool_tip="Rozpocznij rozmowę prywatną (IM)"/>
-		<button label="Zadzwoń" name="call_btn" tool_tip="Zadzwoń do tego Rezydenta"/>
-		<button label="Podziel się" name="share_btn"/>
-		<button label="Teleportuj" name="teleport_btn" tool_tip="Zaproponuj teleportację"/>
-		<button label="Profil grupy" name="group_info_btn" tool_tip="Pokaż informacje o grupie"/>
-		<button label="Konferencja Grupowa" name="chat_btn" tool_tip="Rozpocznij konferencę"/>
-		<button label="Rozmowa Głosowa" name="group_call_btn" tool_tip="Rozmowa Głosowa w tej Grupie"/>
+		<button width="55" label="Profil" name="view_profile_btn" tool_tip="Pokaż zdjęcie, grupy i inne informacje o Rezydencie"/>
+		<button width="35" label="IM" name="im_btn" tool_tip="Rozpocznij rozmowę prywatną (IM)"/>
+		<button width="62" label="Zadzwoń" name="call_btn" tool_tip="Zadzwoń do tego Rezydenta"/>
+		<button width="72" label="Podziel się" name="share_btn"/>
+		<button width="70" label="Teleportuj" name="teleport_btn" tool_tip="Zaproponuj teleportację"/>
+		<button width="69" label="Profil grupy" name="group_info_btn" tool_tip="Pokaż informacje o grupie"/>
+		<button width="124" label="Konferencja Grupowa" name="chat_btn" tool_tip="Rozpocznij konferencę"/>
+		<button width="108" label="Rozmowa Głosowa" name="group_call_btn" tool_tip="Rozmowa Głosowa w tej Grupie"/>
 	</panel>
 </panel>
-- 
cgit v1.2.3


From 960eb2c65fe5618bf977b80a3485a4346d5d85c6 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Fri, 16 Apr 2010 12:52:26 +0300
Subject: Fixed low bug EXT-6825 (The border for context menu for Groups tab is
 invisible and is merged with the background) - allowed to drop shadow.
 Reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/248/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_people_groups.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml
index afa680139d..8f89d37dbb 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="menu_group_plus"
  left="0" bottom="0" visible="false"
- mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
+ mouse_opaque="false" opaque="true" color="MenuDefaultBgColor">
   <menu_item_call
    label="View Info"
    name="View Info">
-- 
cgit v1.2.3


From 9d85f4ebe99ea511b032622de7499e81fd93fbd6 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 16 Apr 2010 17:24:50 +0300
Subject: Fixed normal EXT-6812 ([TRUNCATION] APARIENCIA window > Forma > Boca
 > Labios: prominec. \"Labios: prominenc\" should be \"Labios: prominencia\".)

- There was two reasons:
1. Uninitialized variable in llsliderctrl.(h/cpp) that contains label size. This variable take part in calculation of TextBox size of label.
2. Font of 'label string' and text box was different. This causes wrong calculation of 'label string' length.

Reviwed by Vadim Savchuk and Mike Antipov at https://codereview.productengine.com/secondlife/r/246/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_scrolling_param.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index 8042563900..19eb4bb0d6 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -110,7 +110,6 @@
      increment="1"
      initial_value="0"
      label="[DESC]"
-     label_width="100"
      layout="bottom|left"
      left="6"
      max_val="100"
-- 
cgit v1.2.3


From df65685f7334fb66f1b70f7babd48100a04d1f07 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 16 Apr 2010 17:27:45 +0300
Subject: Fixed EXT-6790(major) - Limit to amount of text output to script
 error/warning window is to limited. Could not find history for
 floater_script_debug_panel.xml. Looks like current max_length="10000" was
 randomly picked as a reasonable value at some point of viewer-2-0
 development. Using viewer-1-23 value for max_length - "2147483647"

Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/250/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_script_debug_panel.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
index bd9925be1d..e94af2c8d5 100644
--- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
@@ -15,7 +15,7 @@
      follows="left|top|right|bottom"
      height="176"
      layout="topleft"
-     max_length="10000"
+     max_length="2147483647"
      name="Chat History Editor"
      parse_highlights="true" 
      width="420"
-- 
cgit v1.2.3


From 35168862f5ecc06166fbd1a9bcd601ae2abbf75b Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 16 Apr 2010 12:28:54 -0400
Subject: EXT-6892 : Add debug setting to show avatar rez times

This pops up a notification whenever another avatar rezzes.  Controlled by a #define, currently set to ON.
---
 indra/newview/skins/default/xui/en/notifications.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6c9564c8cf..ca922bf724 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5968,6 +5968,12 @@ The button will be shown when there is enough space for it.
 Drag items from inventory onto a person in the resident picker
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezNotification"
+   type="notifytip">
+Avatar '[NAME]' rezzed in [TIME] seconds.
+  </notification>
 
   <global name="UnsupportedCPU">
 - Your CPU speed does not meet the minimum requirements.
-- 
cgit v1.2.3


From b42efcfee36640fbded3c4116f8756e941b20d13 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Mon, 19 Apr 2010 13:00:12 +0300
Subject: Update for major task EXT-6564 - Fix wearable editing panels. Added
 temporary "edit" button to outfit list to allow QA test new wearable edit
 panels. Was not reviewed.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 9ece4aead8..6fbb3229ac 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -154,6 +154,16 @@
                  sort_column="look_item_sort"
                  name="look_item_sort" />
             </scroll_list>
+			<!-- TODO remove this button. Added it temporary for QA to be able to test new edit wearable panel (see EXT-6564)-->
+				<button
+				  follows="left|top|right"
+				  height="20"
+				  label="edit"
+				  left="0"
+				  top="0"
+				  layout="topleft"
+				  name="edit_wearable_btn"
+				  width="40" />
 
             <panel
              background_visible="true"
-- 
cgit v1.2.3


From 71c7b2f6d76b29c527d07c01c52127bf4f5b402e Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Mon, 19 Apr 2010 13:23:24 +0300
Subject: completed EXT-6764 Implement filtering of wearables (combobox
 options: Clothes/Body, Objects, All) on Add to Outfit subpanel

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/221/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 93 ++++++++++++++++++----
 1 file changed, 76 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 6fbb3229ac..bc37af0319 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -25,6 +25,10 @@
 		(unknown)
 	</panel.string>
 
+    <!-- Wearables filtering strings -->
+    <string name="Filter.All" value="All"/>
+    <string name="Filter.Clothes/Body" value="Clothes/Body"/>
+    <string name="Filter.Objects" value="Objects"/>
 
     <button
      follows="top|left"
@@ -232,29 +236,18 @@
         <layout_panel
          auto_resize="true"
          default_tab_group="3"
-         height="250" 
-         min_height="120"
+         height="210" 
+         min_height="210"
          name="add_wearables_panel"
          width="300"
          tab_group="2"
          user_resize="true"
          visible="false">
 
-            <text
-             follows="top|left|right"
-             font="SansSerifBold"
-             height="13"
-             layout="topleft"
-             left="5"
-             name="status"
-             text_color="LtGray"
-             top="5"
-             value="Add Wearables"
-             use_ellipses="true"
-             width="275" />
-
+            <!-- *NOTE is not used, invisible and disabled -->
             <filter_editor
              background_image="TextField_Search_Off"
+             enabled="false"
              follows="left|top|right"
              font="SansSerif"
              label="Filter"
@@ -264,13 +257,79 @@
              height="20"
              name="look_item_filter"
              text_color="black"
-             text_pad_left="25" />
+             text_pad_left="25"
+             visible="false"/>
+
+            <layout_stack
+             animate="true"
+             follows="all"
+             height="25"
+             width="300"
+             layout="topleft"
+             orientation="horizontal"
+             name="filter_panels"
+             top="0"
+             left="0">
+                <layout_panel
+                 layout="topleft"
+                 follows="left|top|right"
+                 height="25"
+                 label="IM Control Panel"
+                 name="filter_button_panel"
+                 width="150"
+                 auto_resize="true"
+                 user_resize="false">
+                    <text
+                     follows="top|left|right"
+                     font="SansSerifBold"
+                     height="13"
+                     layout="topleft"
+                     left="5"
+                     name="add_to_outfit_label"
+                     text_color="LtGray"
+                     top="3"
+                     value="Add to Outfit:"
+                     use_ellipses="true"
+                     width="270" />
+                    <button
+                     follows="top|right"
+                     height="20"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay=""
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     is_toggle="true"
+                     label="O"
+                     layout="topleft"
+                     right="-1"
+                     name="filter_button"
+                     top="3"
+                     width="20" />
+                </layout_panel>
+                <layout_panel
+                 auto_resize="true"
+                 height="25"
+                 min_width="130"
+                 name="filter_combobox_panel"
+                 width="150"
+                 user_resize="false"
+                 visible="false">
+                    <combo_box
+                     follows="top|left|right"
+                     height="20"
+                     layout="topleft"
+                     right="-5"
+                     name="filter_wearables_combobox"
+                     top="0"
+                     width="130"/>
+                </layout_panel>
+            </layout_stack>
 
             <inventory_panel
              allow_multi_select="false"
              border="false"
              follows="left|top|right|bottom"
-             height="176"
+             height="155"
              layout="topleft"
              left="0"
              mouse_opaque="false"
-- 
cgit v1.2.3