From 183122bc1dae8832c3dd728bfe76144165a0d2d7 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 7 May 2010 13:44:03 -0400
Subject: EXT-7269 : FIXED : Issue warning dialog when item is deleted that has
 links pointing to it

Warning now comes up if you try to delete an item that has any item links pointing to it (in memory).  This assumes that the viewer actually knows about those links, which is true at least in 2.0 since links only appear in Outfits folders and this code causes those to be fetched into memory on startup.
---
 indra/newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 10914285dd..149a254f49 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2122,6 +2122,19 @@ Price to pay for listing must be at least L$[MIN_PRICE].
 Please enter a higher price.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmItemDeleteHasLinks"
+   type="alertmodal">
+At least one of the items you has link items that point to it.  If you delete this item, its links will permanently stop working.  It is strongly advised to delete the links first.
+
+Are you sure you want to delete these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ConfirmObjectDeleteLock"
-- 
cgit v1.2.3


From 73e6407af8f802bbc4a3932bc5ac32ca8f13ab56 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 7 May 2010 22:07:01 +0300
Subject: EXT-2493 FIXED Added strafe buttons.

- Added slide left and Move right buttons to movement actions panel, when inserting them in xml organized buttons in panel into 3 columns to make their position more easily configurable.

- Removed hiding of fly up and down buttons. When not flying(in walk/run mode) they act as jump ans crouch.

- Added movement mode(walk/run/fly) dependent tooltips for fly/jump/crouch and slide buttons.

- Added comment regarding implementation of move floater buttons toggling when user moves via keyboard (because it's not quite obvious and time consuming when you first encounter it) to LLFloaterMove::postBuild().

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/360

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_moveview.xml      | 146 +++++++++++++++------
 .../default/xui/en/panel_stand_stop_flying.xml     |   6 +-
 2 files changed, 112 insertions(+), 40 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 8e2c57764b..a685094190 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -13,7 +13,7 @@
  save_rect="true"
  save_visibility="true"
  save_dock_state="true"
- width="115">
+ width="113">
     <string
      name="walk_forward_tooltip">
         Walk Forward (press Up Arrow or W)
@@ -22,6 +22,14 @@
      name="walk_back_tooltip">
         Walk Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="walk_left_tooltip">
+        Walk left (press Shift + Left Arrow or A)
+    </string>
+    <string
+     name="walk_right_tooltip">
+        Walk right (press Shift + Right Arrow or D)
+    </string>
     <string
      name="run_forward_tooltip">
         Run Forward (press Up Arrow or W)
@@ -30,6 +38,14 @@
      name="run_back_tooltip">
         Run Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="run_left_tooltip">
+        Run left (press Shift + Left Arrow or A)
+    </string>
+    <string
+     name="run_right_tooltip">
+        Run right (press Shift + Right Arrow or D)
+    </string>
     <string
      name="fly_forward_tooltip">
         Fly Forward (press Up Arrow or W)
@@ -38,6 +54,30 @@
      name="fly_back_tooltip">
         Fly Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="fly_left_tooltip">
+        Fly left (press Shift + Left Arrow or A)
+    </string>
+    <string
+     name="fly_right_tooltip">
+        Fly right (press Shift + Right Arrow or D)
+    </string>
+    <string
+     name="fly_up_tooltip">
+        Fly up (press E)
+    </string>
+    <string
+     name="fly_down_tooltip">
+        Fly down (press C)
+    </string>
+    <string
+     name="jump_tooltip">
+        Jump (press E)
+    </string>
+    <string
+     name="crouch_tooltip">
+        Crouch (press C)
+    </string>
     <string
      name="walk_title">
         Walk
@@ -59,59 +99,91 @@
      mouse_opaque="false"
      name="panel_actions"
      top="0"
-     width="115">
+     width="113">
+        <!-- Buttons in panel are organized in 3 columns to enable their easy vertical adjustment via top_pad-->
+        <!-- Left column -->
         <button
          follows="left|bottom"
-         height="25"
+         height="24"
+         image_selected="Movement_Up_On"
+         image_pressed_selected="Movement_Up_On"
+         image_unselected="Movement_Up_Off"
+         layout="topleft"
+         left="23"
+         name="move up btn"
+         scale_image="false"
+         tool_tip="Fly up (press E)"
+         top="18"
+         width="24" />
+        <button
+         follows="left|bottom"
+         height="24"
          image_selected="Movement_TurnLeft_On"
          image_pressed_selected="Movement_TurnLeft_On"
          image_unselected="Movement_TurnLeft_Off"
          layout="topleft"
-         left="17"
+         left="15"
          name="turn left btn"
          scale_image="false"
          tool_tip="Turn left (press Left Arrow or A)"
-         top="45"
-         width="25" />
-        <button
-         follows="left|bottom"
-         height="25"
-         image_selected="Movement_TurnRight_On"
-         image_pressed_selected="Movement_TurnRight_On"
-         image_unselected="Movement_TurnRight_Off"
-         layout="topleft"
-         left_pad="34"
-         name="turn right btn"
-         scale_image="false"
-         tool_tip="Turn right (press Right Arrow or D)"
-         top_delta="0"
-         width="25" />
-        <button
+         top_pad="-3"
+         width="24" />
+        <joystick_slide
          follows="left|bottom"
-         height="25"
-         image_selected="Movement_Up_On"
-         image_pressed_selected="Movement_Up_On"
-         image_unselected="Movement_Up_Off"
+         height="24"
+         image_selected="Movement_Left_On"
+         image_pressed_selected="Movement_Left_On"
+         image_unselected="Movement_Left_Off"
          layout="topleft"
-         left="10"
-         name="move up btn"
+         left="18"
+         name="move left btn"
+         quadrant="left"
          scale_image="false"
-         tool_tip="Fly up, press E"
-         top="14"
-         width="25" />
+         tool_tip="Walk left (press Shift + Left Arrow or A)"
+         top_pad="-3"
+         width="24" />
+        <!-- Right column -->
         <button
          follows="left|bottom"
-         height="25"
+         height="24"
          image_selected="Movement_Down_On"
          image_pressed_selected="Movement_Down_On"
          image_unselected="Movement_Down_Off"
          layout="topleft"
-         left_pad="45"
+         right="-21"
          name="move down btn"
          scale_image="false"
-         tool_tip="Fly down, press C"
-         top_delta="0"
-         width="20" />
+         tool_tip="Fly down (press C)"
+         top="18"
+         width="24" />
+        <button
+         follows="left|bottom"
+         height="24"
+         image_selected="Movement_TurnRight_On"
+         image_pressed_selected="Movement_TurnRight_On"
+         image_unselected="Movement_TurnRight_Off"
+         layout="topleft"
+         right="-13"
+         name="turn right btn"
+         scale_image="false"
+         tool_tip="Turn left (press Right Arrow or D)"
+         top_pad="-3"
+         width="24" />
+        <joystick_slide
+         follows="left|bottom"
+         height="24"
+         image_selected="Movement_Right_On"
+         image_pressed_selected="Movement_Right_On"
+         image_unselected="Movement_Right_Off"
+         layout="topleft"
+         name="move right btn"
+         quadrant="right"
+         right="-16"
+         scale_image="false"
+         tool_tip="Walk right (press Shift + Right Arrow or D)"
+         top_pad="-3"
+         width="24" />
+        <!-- Middle column -->
         <joystick_turn
          follows="left|bottom"
          height="25"
@@ -124,7 +196,7 @@
          quadrant="up"
          scale_image="false"
          tool_tip="Walk forward (press up arrow or W)"
-         top_delta="10"
+         top="22"
          width="21" />
         <joystick_turn
          follows="left|bottom"
@@ -138,7 +210,7 @@
          quadrant="down"
          scale_image="false"
          tool_tip="Walk backward (press down arrow or S)"
-         top_delta="30"
+         top_pad="7"
          width="21" />
     </panel>
 <!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml -->
@@ -149,7 +221,7 @@
      left="0"
      name="panel_modes"
      top_pad="0"
-     width="115">
+     width="113">
         <button
          follows="left|bottom"
          height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
index b48943c699..3effc9de89 100644
--- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -6,7 +6,7 @@
  name="panel_stand_stop_flying"
  mouse_opaque="false"
  visible="true"
- width="115">
+ width="113">
     <button
      follows="left|bottom"
      height="19"
@@ -16,7 +16,7 @@
      tool_tip="Click here to stand up."
      top="2"
      visible="false"
-     width="115" />
+     width="113" />
     <button
      follows="left|bottom"
      height="19"
@@ -26,5 +26,5 @@
      tool_tip="Stop flying"
      top="2"
      visible="false"
-     width="115" />
+     width="113" />
 </panel>
-- 
cgit v1.2.3


From 2acb8ec669bee189ab3db486e7a3b8b356937e90 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 7 May 2010 13:28:18 -0700
Subject: EXT-6658 WIP removing unwanted linebreak

---
 indra/newview/skins/default/xui/nl/floater_tools.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/nl/floater_tools.xml b/indra/newview/skins/default/xui/nl/floater_tools.xml
index f79d3dbd6b..0f8392428f 100644
--- a/indra/newview/skins/default/xui/nl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/nl/floater_tools.xml
@@ -403,7 +403,7 @@
 			<text name="glow label">
 				Gloed
 			</text>
-			<check_box label="Volledige &#10;helderheid" name="checkbox fullbright" bottom_delta="-21"/>
+			<check_box label="Volledige helderheid" name="checkbox fullbright"/>
 			<text name="tex gen">
 				Mapping
 			</text>
-- 
cgit v1.2.3


From c699f6b0d31c75cc8e26891b7fa97921af6586a6 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 7 May 2010 15:51:58 -0700
Subject: EXT-6844 FIX Shorten ES strings to alleviate UI truncation

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

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

diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
index 38a12002f5..c3a13980de 100644
--- a/indra/newview/skins/default/xui/es/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_world_map.xml
@@ -20,10 +20,10 @@
 			Venta de terreno
 		</text>
 		<text name="by_owner_label">
-			por el propietario
+			por el dueño
 		</text>
 		<text name="auction_label">
-			subasta de terreno
+			subasta
 		</text>
 		<button name="Go Home" tool_tip="Teleportar a mi Base"/>
 		<text name="Home_label">
-- 
cgit v1.2.3


From 09ce956b74bea17869a4d64c620feb03a66a4f5a Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 7 May 2010 15:52:34 -0700
Subject: ND-46735 WIP PT linguistic

---
 .../skins/default/xui/pt/panel_region_debug.xml    | 22 +++++++++++-----------
 .../default/xui/pt/panel_region_general_layout.xml |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
index 2119a06e55..f2cc9f644d 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
@@ -6,15 +6,15 @@
 	<text name="region_text">
 		desconhecido
 	</text>
-	<check_box label="Desabilitar Scripts" name="disable_scripts_check" tool_tip="Desabilitar todos os scripts nesta região"/>
+	<check_box label="Desativar scripts" name="disable_scripts_check" tool_tip="Desativar todos os scripts nesta região"/>
 	<button label="?" name="disable_scripts_help"/>
-	<check_box label="Desabilitar colisões" name="disable_collisions_check" tool_tip="Desabilitar colisões de não-avatares nessa região"/>
+	<check_box label="Desativar colisões" name="disable_collisions_check" tool_tip="Desabilitar colisões de não-avatares nessa região"/>
 	<button label="?" name="disable_collisions_help"/>
-	<check_box label="Desabilitar física" name="disable_physics_check" tool_tip="Desabilitar toda a físíca nesta região"/>
+	<check_box label="Desativar física" name="disable_physics_check" tool_tip="Desativar toda a físíca nesta região"/>
 	<button label="?" name="disable_physics_help"/>
 	<button label="Aplicar" name="apply_btn"/>
 	<text name="objret_text_lbl" width="130">
-		Retornar objeto
+		Devolver objeto
 	</text>
 	<text name="resident_text_lbl">
 		Residente:
@@ -27,14 +27,14 @@
 		Opções:
 	</text>
 	<check_box label="Com scripts" name="return_scripts" tool_tip="Só devolver objetos com scripts"/>
-	<check_box label="No terreno de outra pessoa" name="return_other_land" tool_tip="Retornar apenas objetos que estejam na terra pertencente a alguém"/>
-	<check_box label="Em todas as regiões desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/>
-	<button label="Retornar" name="return_btn"/>
-	<button label="Pegar os principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as mais potenciais colisões" width="280"/>
+	<check_box label="No terreno de outra pessoa" name="return_other_land" tool_tip="Devolver apenas objetos que estejam em terrenos de outra pessoa"/>
+	<check_box label="Em todas as regiões desta propriedade" name="return_estate_wide" tool_tip="Devolver objetos em todas as regiões que constituem esta propriedade"/>
+	<button label="Devolver" name="return_btn"/>
+	<button label="Principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos com maior potencial de colisão" width="280"/>
 	<button label="?" left="297" name="top_colliders_help"/>
-	<button label="Pegar Principais Scripts..." name="top_scripts_btn" tool_tip="Lista de objetos gastando mais tempo rodando scripts" width="280"/>
+	<button label="Principais scripts..." name="top_scripts_btn" tool_tip="Lista de objetos que mais passam tempo executando scripts" width="280"/>
 	<button label="?" left="297" name="top_scripts_help"/>
-	<button label="Reiniciar a Região" name="restart_btn" tool_tip="Dar 2 minutos de contagem regressiva e reiniciar a região"/>
+	<button label="Reiniciar a região" name="restart_btn" tool_tip="Após 2 minutos de contagem regressiva, reiniciar a região"/>
 	<button label="?" name="restart_help"/>
-	<button label="Atrasar o Reinicio" name="cancel_restart_btn" tool_tip="Atrasar o reinicio da região por uma hora"/>
+	<button label="Adiar reinício" name="cancel_restart_btn" tool_tip="Adiar o reinício da região por uma hora"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml
index d2d5fb649c..534b2826af 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml
@@ -18,12 +18,12 @@
 	<text name="region_type">
 		(Desconhecido)
 	</text>
-	<check_box label="Bloquear terraplanagem" name="block_terraform_check"/>
+	<check_box label="Bloquear terraplanagens" name="block_terraform_check"/>
 	<check_box label="Bloquear voos" name="block_fly_check"/>
 	<check_box label="Permitir danos" name="allow_damage_check"/>
 	<check_box label="Limitar empurrões" name="restrict_pushobject"/>
 	<check_box label="Permitir revenda de terrenos" name="allow_land_resell_check"/>
-	<check_box label="Permitir junção e divisão de terrenos" name="allow_parcel_changes_check"/>
+	<check_box label="Permitir união e divisão de terrenos" name="allow_parcel_changes_check"/>
 	<check_box label="Não mostrar nos resultados de pesquisa" name="block_parcel_search_check" tool_tip="Mostrar esta região e lotes nos resultados de pesquisa"/>
 	<spinner label="Limite do agente" name="agent_limit_spin"/>
 	<spinner label="Bônus do objeto" name="object_bonus_spin"/>
-- 
cgit v1.2.3


From 7108c9e07afa538ef9357582ae52a27abcd3708c Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 7 May 2010 16:25:07 -0700
Subject: EXT-7111 FIX missing translation for 5 langs

---
 indra/newview/skins/default/xui/da/menu_login.xml | 1 +
 indra/newview/skins/default/xui/es/menu_login.xml | 1 +
 indra/newview/skins/default/xui/it/menu_login.xml | 1 +
 indra/newview/skins/default/xui/pl/menu_login.xml | 1 +
 indra/newview/skins/default/xui/pt/menu_login.xml | 1 +
 5 files changed, 5 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml
index 1408702a1c..36e82e8bc4 100644
--- a/indra/newview/skins/default/xui/da/menu_login.xml
+++ b/indra/newview/skins/default/xui/da/menu_login.xml
@@ -6,6 +6,7 @@
 	</menu>
 	<menu label="Hjælp" name="Help">
 		<menu_item_call label="[SECOND_LIFE] hjælp" name="Second Life Help"/>
+		<menu_item_call label="Om [APP_NAME]" name="About Second Life"/>
 	</menu>
 	<menu_item_check label="Vis debug menu" name="Show Debug Menu"/>
 	<menu label="Debug" name="Debug">
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
index df21ced9ab..101cddc6aa 100644
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -6,6 +6,7 @@
 	</menu>
 	<menu label="Ayuda" name="Help">
 		<menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
 	</menu>
 	<menu_item_check label="Mostrar el menú &apos;Debug&apos;" name="Show Debug Menu"/>
 	<menu label="Depurar" name="Debug">
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index b0edeb3618..904b819198 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -6,6 +6,7 @@
 	</menu>
 	<menu label="Aiuto" name="Help">
 		<menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
 	</menu>
 	<menu_item_check label="Mostra menu Debug" name="Show Debug Menu"/>
 	<menu label="Debug" name="Debug">
diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml
index 2673f5c271..ed4937182f 100644
--- a/indra/newview/skins/default/xui/pl/menu_login.xml
+++ b/indra/newview/skins/default/xui/pl/menu_login.xml
@@ -6,6 +6,7 @@
 	</menu>
 	<menu label="Pomoc" name="Help">
 		<menu_item_call label="[SECOND_LIFE]: Pomoc" name="Second Life Help"/>
+		<menu_item_call label="O [APP_NAME]" name="About Second Life"/>
 	</menu>
 	<menu label="Debug" name="Debug">
 		<menu label="Edytuj" name="Edit">
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index a7df67a6b5..8ea87a06d1 100644
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -6,6 +6,7 @@
 	</menu>
 	<menu label="Ajuda" name="Help">
 		<menu_item_call label="Ajuda do [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
 	</menu>
 	<menu_item_check label="Exibir menu de depuração" name="Show Debug Menu"/>
 	<menu label="Depurar" name="Debug">
-- 
cgit v1.2.3