From 409a401ebb59fcf28ba25aaeab44ca8d00960c84 Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Mon, 5 Dec 2011 14:56:33 -0800
Subject: VWR-17587: Added "Fly/Land on holding up/down" option under Move
 preferences

---
 indra/newview/skins/default/xui/en/panel_preferences_move.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index d9067b41c7..198fcf9355 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -129,6 +129,16 @@
    name="tap_tap_hold_to_run"
    width="237"
    top_pad="0"/>
+  <check_box
+   control_name="AutomaticFly"
+   follows="left|top"
+   height="20"
+   label="Fly/land on holding up/down"
+   layout="topleft"
+   left_delta="0"
+   name="automatic_fly"
+   width="237"
+   top_pad="0"/>
   <text
    follows="left|top"
    type="string"
-- 
cgit v1.2.3


From 47044de069c2c1442a33d719846cdbf1e3450124 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 4 Jun 2012 11:23:38 -0400
Subject: STORM-1838 Add "Request Teleport" option to the menu when
 right-clicking on avatars in the Nearby list

---
 .../skins/default/xui/en/menu_people_nearby.xml    |  7 +++++++
 .../newview/skins/default/xui/en/notifications.xml | 23 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index d2e35e4cc0..cff383cab1 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -70,6 +70,13 @@
         <menu_item_call.on_click
          function="Avatar.Pay" />
     </menu_item_call>
+    <menu_item_call
+     label="Request Teleport"
+     layout="topleft"
+     name="Request Teleport">
+        <menu_item_call.on_click
+         function="Avatar.RequestTeleport" />
+    </menu_item_call>
     <menu_item_check
      label="Block/Unblock"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index afc5b916e7..54ba03ad59 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6149,6 +6149,29 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
 	Teleport offer sent to [TO_NAME]
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="TeleportRequest"
+   type="notify">
+[NAME] is requesting to be teleported your to your location.
+
+Will you permit this?
+    <tag>confirm</tag>
+    <form name="form">
+      <button
+       index="0"
+       name="Yes"
+       text="Yes"/>
+      <button
+       index="1"
+       name="No"
+       text="No"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Block"/>
+    </form>
+  </notification>
 
   <notification
    icon="notify.tga"
-- 
cgit v1.2.3


From 6e44b8342a37e0fe8c9795c69b1d36a60b30fdcb Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Tue, 21 Aug 2012 12:30:00 +0100
Subject: VWR-29543 In merchant outbox "create a Marketplace store" link opens
 wrong article in KB.

---
 indra/newview/skins/default/xui/de/strings.xml | 2 +-
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 indra/newview/skins/default/xui/es/strings.xml | 2 +-
 indra/newview/skins/default/xui/fr/strings.xml | 2 +-
 indra/newview/skins/default/xui/it/strings.xml | 2 +-
 indra/newview/skins/default/xui/ja/strings.xml | 2 +-
 indra/newview/skins/default/xui/pt/strings.xml | 2 +-
 indra/newview/skins/default/xui/ru/strings.xml | 2 +-
 indra/newview/skins/default/xui/tr/strings.xml | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 668a7b35bf..a171965dc9 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1250,7 +1250,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d5186e4c1b..e3f6e93df6 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2176,7 +2176,7 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
 	<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
 	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
-	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4</string>
+	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3</string>
 	<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
 	<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
 	<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index adc32ba168..35ad5eaebd 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -1232,7 +1232,7 @@ Intenta iniciar sesión de nuevo en unos instantes.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 0987952c28..7ed0fdffe7 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1250,7 +1250,7 @@ Veuillez réessayer de vous connecter dans une minute.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 11accb5f08..80d047f1c9 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -1241,7 +1241,7 @@ Prova ad accedere nuovamente tra un minuto.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index f6b3edc57f..1d29e3defc 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1250,7 +1250,7 @@ support@secondlife.com にお問い合わせください。
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index fd8f22f331..82d1e6ae75 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -1196,7 +1196,7 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 78e4b134fb..9ba1ea4745 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -1247,7 +1247,7 @@ support@secondlife.com.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 1be0970e4e..04c0223fae 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -1247,7 +1247,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
-- 
cgit v1.2.3


From e386aa73b7af5ca326f66fa3fb0482e42b3af33f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 11 Jan 2013 11:13:44 -0500
Subject: STORM-1838

---
 indra/newview/skins/default/xui/en/menu_inventory.xml     | 6 ++++++
 indra/newview/skins/default/xui/en/menu_people_nearby.xml | 2 +-
 indra/newview/skins/default/xui/en/notifications.xml      | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index b13bf5b508..051bb800e7 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -590,6 +590,12 @@
          function="Inventory.BeginIMSession"
          parameter="selected" />
     </menu_item_call>
+    <menu_item_call
+     label="Request Teleport"
+     name="Request Teleport">
+        <menu_item_call.on_click
+        function="Avatar.TeleportRequest" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" 
      name="Gesture Separator" />
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index cff383cab1..951f43f325 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -75,7 +75,7 @@
      layout="topleft"
      name="Request Teleport">
         <menu_item_call.on_click
-         function="Avatar.RequestTeleport" />
+         function="Avatar.TeleportRequest" />
     </menu_item_call>
     <menu_item_check
      label="Block/Unblock"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 54ba03ad59..f85b62c944 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6153,7 +6153,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
    icon="notify.tga"
    name="TeleportRequest"
    type="notify">
-[NAME] is requesting to be teleported your to your location.
+[NAME_SLURL] is requesting to be teleported your to your location.
 
 Will you permit this?
     <tag>confirm</tag>
@@ -6168,8 +6168,8 @@ Will you permit this?
        text="No"/>
       <button
        index="2"
-       name="Mute"
-       text="Block"/>
+       name="IM"
+       text="IM"/>
     </form>
   </notification>
 
-- 
cgit v1.2.3


From f64e11dfe1490c1a89e00cf5dc368dd1dc25b866 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 24 Jan 2013 14:27:10 -0500
Subject: STORM-1838 Add optional message processing

---
 .../newview/skins/default/xui/en/notifications.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0628e54902..3baf223172 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3927,6 +3927,27 @@ Join me in [REGION]
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportRequestPrompt"
+   type="alertmodal">
+Request a teleport to their location with the following message
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" type="text">
+
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
   <notification
    icon="alertmodal.tga"
    name="TooManyTeleportOffers"
@@ -6520,6 +6541,7 @@ However, this region contains content accessible to adults only.
    name="TeleportRequest"
    type="notify">
 [NAME_SLURL] is requesting to be teleported your to your location.
+[MESSAGE]
 
 Will you permit this?
     <tag>confirm</tag>
-- 
cgit v1.2.3


From 0afbc85efadfb3e3e825a5cade9f76876fbdf1a4 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 25 Jan 2013 06:23:56 -0500
Subject: STORM-1838 Minor UI improvements and code changes

---
 indra/newview/skins/default/xui/en/notifications.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3baf223172..e41f8c8e8c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3931,7 +3931,7 @@ Join me in [REGION]
    icon="alertmodal.tga"
    name="TeleportRequestPrompt"
    type="alertmodal">
-Request a teleport to their location with the following message
+Request a teleport to [NAME] location with the following message
     <tag>confirm</tag>
     <form name="form">
       <input name="message" type="text">
@@ -6478,7 +6478,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
    type="offer">
 [NAME_SLURL] has offered to teleport you to their location:
 
-“[MESSAGE]”
+"[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
     <tag>confirm</tag>
     <form name="form">
@@ -6543,7 +6543,7 @@ However, this region contains content accessible to adults only.
 [NAME_SLURL] is requesting to be teleported your to your location.
 [MESSAGE]
 
-Will you permit this?
+Offer a teleport?
     <tag>confirm</tag>
     <form name="form">
       <button
-- 
cgit v1.2.3


From 3882945fb9cfbe2710b8f05c7bf8b8c079272191 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sat, 26 Jan 2013 07:00:44 -0500
Subject: STORM-1838 Add code for right click menu on inventory calling cards.
 Add initial support to insert teleport request into existing IM window.

---
 indra/newview/skins/default/xui/en/menu_inventory.xml   | 14 ++++++++------
 .../newview/skins/default/xui/en/menu_people_nearby.xml | 17 ++++++++++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index ef315e1a8d..512205ba43 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -590,6 +590,14 @@
          function="Inventory.DoToSelected"
          parameter="lure" />
     </menu_item_call>
+    <menu_item_call
+     label="Request Teleport..."
+     layout="topleft"
+     name="Request Teleport...">
+        <menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="request_lure" />
+    </menu_item_call>
     <menu_item_call
      label="Start Conference Chat"
      layout="topleft"
@@ -598,12 +606,6 @@
          function="Inventory.BeginIMSession"
          parameter="selected" />
     </menu_item_call>
-    <menu_item_call
-     label="Request Teleport"
-     name="Request Teleport">
-        <menu_item_call.on_click
-        function="Avatar.TeleportRequest" />
-    </menu_item_call>
     <menu_item_separator
      layout="topleft" 
      name="Gesture Separator" />
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 951f43f325..e7a27c39fa 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -70,13 +70,6 @@
         <menu_item_call.on_click
          function="Avatar.Pay" />
     </menu_item_call>
-    <menu_item_call
-     label="Request Teleport"
-     layout="topleft"
-     name="Request Teleport">
-        <menu_item_call.on_click
-         function="Avatar.TeleportRequest" />
-    </menu_item_call>
     <menu_item_check
      label="Block/Unblock"
      layout="topleft"
@@ -99,4 +92,14 @@
       function="Avatar.EnableItem"
       parameter="can_offer_teleport"/>
     </menu_item_call>
+    <menu_item_call
+     label="Request Teleport"
+     layout="topleft"
+     name="Request Teleport">
+        <menu_item_call.on_click
+         function="Avatar.TeleportRequest"/>
+        <menu_item_call.on_enable
+         function="Avatar.EnableItem"
+         parameter="can_offer_teleport" />
+    </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From 0092ec9bd96410f54a82040647f9c361550cde51 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 28 Jan 2013 16:37:03 -0500
Subject: STORM-1929 Top bar: speaker icon clipped, overlapping UI elements

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

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

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 dd2a0c6627..064ece6e4b 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -113,7 +113,7 @@
      image_pressed="Pause_Press"
      image_pressed_selected="Play_Press"
      is_toggle="true"
-     left_pad="15"
+     left_pad="5"
      top="1"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"
-- 
cgit v1.2.3


From 9de2371f157fa7f62b1c91949fb05b45f18c9812 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 1 Feb 2013 17:04:53 -0500
Subject: make teleport requests appear correctly with respect to open im
 sessions

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e41f8c8e8c..0026555781 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6539,7 +6539,7 @@ However, this region contains content accessible to adults only.
   <notification
    icon="notify.tga"
    name="TeleportRequest"
-   type="notify">
+   type="offer">
 [NAME_SLURL] is requesting to be teleported your to your location.
 [MESSAGE]
 
-- 
cgit v1.2.3


From c8533650b4779040c5e196f9ff156e3454edc9c8 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 1 Feb 2013 17:30:37 -0500
Subject: STORM-1838 Remove IM button

---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0026555781..dba84b6c6b 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6554,10 +6554,6 @@ Offer a teleport?
        index="1"
        name="No"
        text="No"/>
-      <button
-       index="2"
-       name="IM"
-       text="IM"/>
     </form>
   </notification>
 
-- 
cgit v1.2.3


From bf981db8b98cd9f8048a1a800d7e99907fecd1a8 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 23 Feb 2013 00:12:08 +0100
Subject: STORM-1932: Region/Estate floater contains unlocalizable strings

---
 indra/newview/skins/default/xui/en/strings.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4383b98592..c4a3f2c5b6 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2453,7 +2453,11 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 		all estates that you manage for [OWNER]
 	</string>
 	<string name="RegionInfoAllowedResidents">Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
-	<string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
+	<string name="RegionInfoAllowedGroups">Allowed Groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
+	<string name="RegionInfoEstateManagers">Estate Managers: ([ESTATEMANAGERS], max [MAXMANAGERS])</string>
+	<string name="RegionInfoBannedResidents">Banned Residents: ([BANNEDAGENTS], max [MAXBANNED])</string>
+	<string name="RegionInfoListTypeAllowedAgents">Allowed Residents</string>
+	<string name="RegionInfoListTypeBannedAgents">Banned Residents</string>
 
 	<!-- script limits floater -->
 	<string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string>
-- 
cgit v1.2.3


From f3025b0ae4a2ff714cca68f69d0aa06aed925c1f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 23 Feb 2013 02:01:07 +0100
Subject: STORM-1933: Certain show in search categories for parcels will not
 stay selected

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 793a6e6fa1..a660e812cc 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1365,7 +1365,7 @@ Only large parcels can be listed in search.
                 <combo_box.item
                  label="Any Category"
                  name="item0"
-                 value="any" />
+                 value="none" />
                 <combo_box.item
                  label="Linden Location"
                  name="item1"
-- 
cgit v1.2.3


From d902534f969343611e0fdadde6e242cde842da9f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 5 Mar 2013 11:16:03 -0500
Subject: STORM-1838 Remove redundant word in notification message

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index dba84b6c6b..80bc9038ed 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6540,7 +6540,7 @@ However, this region contains content accessible to adults only.
    icon="notify.tga"
    name="TeleportRequest"
    type="offer">
-[NAME_SLURL] is requesting to be teleported your to your location.
+[NAME_SLURL] is requesting to be teleported to your location.
 [MESSAGE]
 
 Offer a teleport?
-- 
cgit v1.2.3


From ec52db8d0c4099dd5e3b476f7b44a4ebda7cb676 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 5 Jun 2013 17:32:10 -0400
Subject: STORM-1838 Slowly reappling changes to work with CHUI

---
 indra/newview/skins/default/xui/en/menu_conversation.xml  | 9 +++++++++
 indra/newview/skins/default/xui/en/menu_people_nearby.xml | 9 +++++++++
 2 files changed, 18 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 5a13ef0a59..c2c15023c5 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -46,6 +46,15 @@
         <on_click function="Avatar.DoToSelected" parameter="offer_teleport"/>
         <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/>
     </menu_item_call>
+
+    <menu_item_call
+     label="Request teleport"
+     layout="topleft"
+     name="request_teleport">
+        <on_click function="Avatar.DoToSelected" parameter="request_teleport"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/>
+    </menu_item_call>
+
     <menu_item_call
      label="Voice call"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 25b100bc94..80e8e59076 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -28,6 +28,15 @@
       function="Avatar.EnableItem"
       parameter="can_offer_teleport"/>
     </menu_item_call>
+    <menu_item_call
+    label="Request Teleport"
+    name="request_teleport">
+      <menu_item_call.on_click
+       function="Avatar.TeleportRequest"/>
+      <menu_item_call.on_enable
+      function="Avatar.EnableItem"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
     <menu_item_call
      label="Voice call"
      layout="topleft"
-- 
cgit v1.2.3


From 9b1840c1c95a1a4adad913e0c162048fb78c537d Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 6 Jun 2013 16:34:24 -0400
Subject: STORM-1838 Added teleport request to conversation log.  Added xml to
 have message appear in IM window, if open.  Code cleanup.

---
 indra/newview/skins/default/xui/en/menu_conversation.xml       |  2 --
 .../skins/default/xui/en/menu_conversation_log_gear.xml        | 10 ++++++++++
 indra/newview/skins/default/xui/en/notifications.xml           |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index c2c15023c5..d8eb2f0ffd 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -46,7 +46,6 @@
         <on_click function="Avatar.DoToSelected" parameter="offer_teleport"/>
         <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/>
     </menu_item_call>
-
     <menu_item_call
      label="Request teleport"
      layout="topleft"
@@ -54,7 +53,6 @@
         <on_click function="Avatar.DoToSelected" parameter="request_teleport"/>
         <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/>
     </menu_item_call>
-
     <menu_item_call
      label="Voice call"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
index 8796b87955..a1a3afbf68 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
@@ -56,6 +56,16 @@
       function="Calllog.Enable"
       parameter="can_offer_teleport"/>
     </menu_item_call>
+    <menu_item_call
+    label="Request Teleport"
+    name="request_teleport">
+      <on_click
+       function="Calllog.Action"
+       parameter="request_teleport"/>
+      <on_enable
+      function="Calllog.Enable"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
     <menu_item_separator />
     <menu_item_call
      label="Add Friend"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 31e3e7fc30..3a01084b9a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6630,6 +6630,7 @@ However, this region contains content accessible to adults only.
   <notification
    icon="notify.tga"
    name="TeleportRequest"
+   log_to_im="true"
    type="offer">
 [NAME_SLURL] is requesting to be teleported to your location.
 [MESSAGE]
-- 
cgit v1.2.3


From d233d8836b610b5e5ca76a1e3bb4d63dc3592e66 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 6 Jun 2013 17:16:00 -0400
Subject: STORM-1838 Remove incorrect XML menu text

---
 indra/newview/skins/default/xui/en/menu_people_nearby.xml | 11 -----------
 1 file changed, 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 80e8e59076..f12226ebeb 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -143,15 +143,4 @@
          function="Avatar.EnableItem"
          parameter="can_block" />
     </menu_item_check>
-    <menu_item_separator />
-    <menu_item_call
-     label="Request Teleport"
-     layout="topleft"
-     name="Request Teleport">
-        <menu_item_call.on_click
-         function="Avatar.TeleportRequest"/>
-        <menu_item_call.on_enable
-         function="Avatar.EnableItem"
-         parameter="can_offer_teleport" />
-    </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From 4faad350c7dd7fa2e2606231d8293c357823348a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 24 Jul 2013 12:34:32 -0400
Subject: Improve envelope notification behavior when there is no toast to
 display

---
 indra/newview/skins/default/xui/en/notifications.xml | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 15fbb130a4..0f2ee73950 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6756,7 +6756,6 @@ Offer a teleport?
    icon="notify.tga"
    name="FriendshipOffered"
    log_to_im="true"   
-   show_toast="false"   
    type="notify">
     <tag>friendship</tag>
 	You have offered friendship to [TO_NAME]
@@ -6806,7 +6805,6 @@ Offer a teleport?
    icon="notify.tga"
    name="FriendshipAcceptedByMe"
    log_to_im="true"   
-   show_toast="false"
    type="notify">
     <tag>friendship</tag>
 Friendship offer accepted.
@@ -6816,7 +6814,6 @@ Friendship offer accepted.
    icon="notify.tga"
    name="FriendshipDeclinedByMe"
    log_to_im="true"   
-   show_toast="false"   
    type="notify">
     <tag>friendship</tag>
 Friendship offer declined.
-- 
cgit v1.2.3


From ee0b66f080de53f70599c824d5ff231d6a9c739f Mon Sep 17 00:00:00 2001
From: "Jeff (Gioffredo Linden)" <gioffredo@lindenlab.com>
Date: Thu, 25 Jul 2013 16:07:16 -0400
Subject: VITA test framework - record events support

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b01c3067ff..b71faa2d3e 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2919,6 +2919,34 @@
          label="Recorder"
          name="Recorder"
          tear_off="true">
+            <menu_item_call visible="false"
+             label="Start event recording"
+             name="Start event recording">
+	      <menu_item_call.on_visible
+		 function="displayViewerEventRecorderMenuItems" />
+                <menu_item_call.on_click
+                 function="Advanced.EventRecorder"
+                 parameter="start recording" />
+            </menu_item_call>
+            <menu_item_call visible="false"
+             label="Stop event recording"
+             name="Stop event recording">
+	      <menu_item_call.on_visible
+		 function="displayViewerEventRecorderMenuItems" />
+                <menu_item_call.on_click
+                 function="Advanced.EventRecorder"
+                 parameter="stop recording" />
+            </menu_item_call>
+            <menu_item_call visible="false"
+             label="Playback event recording"
+             name="Playback event recording">
+	      <menu_item_call.on_visible
+		 function="displayViewerEventRecorderMenuItems" />
+                <menu_item_call.on_click
+                 function="Advanced.EventRecorder"
+                 parameter="start playback" />
+            </menu_item_call>
+
             <menu_item_call
              label="Start Playback"
              name="Start Playback">
-- 
cgit v1.2.3


From 22a931efad1380e6c04dce12fe5b16c21d98a908 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 28 Jul 2013 10:42:51 -0400
Subject: STORM-1957 World Map - Land For Sale is missing L$ / sqm

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f7b33b0a4a..3030a1ae9f 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -378,7 +378,7 @@ Please try logging in again in a minute.</string>
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
 	<string name="worldmap_offline">Offline</string>
-	<string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE]</string>
+	<string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE] ([SQMPRICE] L$/m²)</string>
 	<string name="worldmap_results_none_found">None found.</string>
 
 	<!-- animations uploading status codes -->
-- 
cgit v1.2.3


From 9e5dbcfde52f7cf32d2757172cf6de23bd3b8156 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 29 Jul 2013 13:52:48 -0400
Subject: STORM-1838 Add display name handling to the initial notification

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3a01084b9a..5c5d3b342a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3975,7 +3975,7 @@ Join me in [REGION]
    icon="alertmodal.tga"
    name="TeleportRequestPrompt"
    type="alertmodal">
-Request a teleport to [NAME] location with the following message
+Request a teleport to [NAME_SLURL] with the following message
     <tag>confirm</tag>
     <form name="form">
       <input name="message" type="text">
-- 
cgit v1.2.3


From d43a302eaf1b0ca521d4b865e39a8d849da5d5b8 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 29 Aug 2013 16:51:59 -0400
Subject: MAINT-3075: don't display the target user name as a SLURL in the
 RequestTeleport dialog

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9ed9a6f409..fce21b403b 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4073,7 +4073,7 @@ Join me in [REGION]
    icon="alertmodal.tga"
    name="TeleportRequestPrompt"
    type="alertmodal">
-Request a teleport to [NAME_SLURL] with the following message
+Request a teleport to [NAME] with the following message
     <tag>confirm</tag>
     <form name="form">
       <input name="message" type="text">
-- 
cgit v1.2.3


From f4d2e21f4fdf6953cfa375bd716b1458e3de14e8 Mon Sep 17 00:00:00 2001
From: ZaiLynch <none@none>
Date: Wed, 11 Sep 2013 12:17:22 -0400
Subject: Changing shortcut to toggle preference floater

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index dabfc4eebd..0e95a9d9a9 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -180,7 +180,7 @@
          name="Preferences"
          shortcut="control|P">
             <menu_item_call.on_click
-             function="Floater.Show"
+             function="Floater.Toggle"
              parameter="preferences" />
         </menu_item_call>
          <menu_item_call
-- 
cgit v1.2.3


From ba7a564700ba20c6ece7ab16197c2415ebec42cb Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 3 Oct 2013 18:21:19 -0400
Subject: improve preference label for fly/jump

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 198fcf9355..8794e3bf95 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -133,7 +133,7 @@
    control_name="AutomaticFly"
    follows="left|top"
    height="20"
-   label="Fly/land on holding up/down"
+   label="Hold jump or crouch key to start or stop flying"
    layout="topleft"
    left_delta="0"
    name="automatic_fly"
@@ -270,4 +270,4 @@
      function="Floater.Show"
      parameter="pref_joystick" />
   </button>
-</panel>
\ No newline at end of file
+</panel>
-- 
cgit v1.2.3