From 363ee42d53bd3049df0d17f16e211fac6b73daf7 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Wed, 9 Dec 2009 18:44:01 +0000
Subject: EXT-3234: Display notification when SLurl blocked/throttled.

We block or throttled certain SLurls when they came from an untrusted
browser. Previously this would happen silently (though a message was
sent to the logfile). Now we show a once-per-session notification if
either of these situations arise.
---
 indra/newview/skins/default/xui/en/notifications.xml | 17 +++++++++++++++++
 1 file changed, 17 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 f659062cfe..69d7a1dd33 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5754,6 +5754,23 @@ You just entered a region using a different server version, which may affect per
 The SLurl you clicked on is not supported.
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="BlockedSLURL"
+   priority="high"
+   type="notifytip">
+A SLurl was received from an untrusted browser and has been blocked for your security.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="ThrottledSLURL"
+   priority="high"
+   type="notifytip">
+Multiple SLurls were received from an untrusted browser within a short period.
+They will be blocked for a few seconds for your security. 
+  </notification>
+
   <notification name="IMToast" type="notifytoast">
 [MESSAGE]
     <form name="form">
-- 
cgit v1.2.3


From dc8365ff00c5ae33f31d779efa23f7872ec368a7 Mon Sep 17 00:00:00 2001
From: "Eric M. Tulla (BigPapi)" <tulla@lindenlab.com>
Date: Wed, 9 Dec 2009 16:27:39 -0500
Subject: Fix for EXT-2703 & EXT-2708 - save texture as issues Added save as to
 texture preview floater.  Fixed behavior of save as (was only working for
 textures, not snapshots). Removed advanced menu entry for save texture as
 (refused to work after multiple implementations).

---
 indra/newview/skins/default/xui/en/floater_preview_texture.xml | 9 +++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml             | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index 52a19ac6b3..054f3be70a 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -60,6 +60,15 @@
      left_pad="5"
      name="Discard"
      top_delta="0"
+     width="100" />
+	 <button
+     follows="left|bottom"
+     height="22"
+     label="Save As"
+     layout="topleft"
+     left_pad="5"
+     name="save_tex_btn"
+     top_delta="0"
      width="100" />
      <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ae8a1599a9..07e509d993 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1189,15 +1189,6 @@
              function="ToggleControl"
              parameter="CompressSnapshotsToDisk" />
         </menu_item_check>
-        <menu_item_call
-         label="Save Texture As"
-         layout="topleft"
-         name="Save Texture As">
-            <menu_item_call.on_click
-             function="File.SaveTexture" />
-            <menu_item_call.on_enable
-             function="File.EnableSaveAs" />
-        </menu_item_call>
         <menu_item_separator
          layout="topleft" />
         <menu
-- 
cgit v1.2.3


From 272bb744af3dd942369f4c378db316e182a1ab87 Mon Sep 17 00:00:00 2001
From: "Eric M. Tulla (BigPapi)" <tulla@lindenlab.com>
Date: Wed, 9 Dec 2009 20:24:37 -0500
Subject: Fix for save texture functionality no longer respecting permissions

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index 054f3be70a..602a18ea56 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -61,7 +61,7 @@
      name="Discard"
      top_delta="0"
      width="100" />
-	 <button
+    <button
      follows="left|bottom"
      height="22"
      label="Save As"
@@ -70,7 +70,7 @@
      name="save_tex_btn"
      top_delta="0"
      width="100" />
-     <text
+    <text
      type="string"
      length="1"
      follows="left|bottom"
-- 
cgit v1.2.3


From d06ef8878388b8b9956b385a74b7114a82de2355 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Thu, 10 Dec 2009 19:02:33 +0000
Subject: DEV-43679: Display god level warning in Search window.

If you change your god level from when you performed a search, the
search results may be inappropriate for your god level (we pass the
current god status to the search web pages). When this is the case, we
now display a warning at the bottom of the search floater to let the
user know that they should redo their search.
---
 indra/newview/skins/default/xui/en/floater_search.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 82e4d87b28..e6bdcdf78e 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -55,8 +55,20 @@
              layout="topleft"
              left_delta="0"
              name="status_text"
-             top_pad="5"
+             top_pad="7"
              width="150" />
+            <text
+             visible="false"
+             follows="bottom|right"
+             height="16"
+             left_delta="0"
+             name="refresh_search"
+             left_pad="0"
+             right="-10"
+             halign="right"
+             width="450">
+               Redo search to reflect current God level
+            </text>
         </layout_panel>
     </layout_stack>
 </floater>
-- 
cgit v1.2.3


From b3f8cec38c15fecaf39b7b187aa46e8df9df8eff Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Thu, 10 Dec 2009 22:38:29 +0000
Subject: DEV-43977: Changed pre-login help browser behavior.

The special pre_login_help topic is now only displayed when the user
clicks on the "Need help logging in?" link on the login screen, or
selects the top-level Help > Second Life Help (F1) menu.
---
 indra/newview/skins/default/xui/en/menu_login.xml  | 3 ++-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 9b439c16e0..53be40d7fd 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -45,7 +45,8 @@
          name="Second Life Help"
          shortcut="F1">
             <menu_item_call.on_click
-             function="ShowHelp" />
+             function="ShowHelp"
+             parameter="f1_help" />
         </menu_item_call>
         <menu_item_separator />
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 861b0de2cf..6f2d696e9e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1064,7 +1064,8 @@
          name="Second Life Help"
          shortcut="F1">
             <menu_item_call.on_click
-             function="ShowHelp" />
+             function="ShowHelp"
+             parameter="f1_help" />
         </menu_item_call>
         <menu_item_call
          label="Tutorial"
-- 
cgit v1.2.3


From af3aae559e3205575d0bf2896473908164a00b3e Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Thu, 10 Dec 2009 16:00:40 -0800
Subject: Delete the 'Test' language from the viewer. There is no more time to
 update it to last month of UI changes; and its use for Localizability Testing
 is now done.

---
 indra/newview/skins/default/xui/en/panel_preferences_general.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 8aba8b9dd1..b5c6b637e5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -92,11 +92,7 @@
          name="(Japanese)"
          value="ja" />
 
-        <combo_box.item
-         enabled="true"
-         label="Test Language"
-         name="TestLanguage"
-         value="test" />
+
     </combo_box>
     <text
      type="string"
-- 
cgit v1.2.3


From 12f91564e857ba638a2b9604f1990ba620348dc9 Mon Sep 17 00:00:00 2001
From: Soft Linden <soft@lindenlab.com>
Date: Thu, 10 Dec 2009 18:46:07 -0600
Subject: DEV-28327 Remove ELAR email field from client

---
 .../newview/skins/default/xui/en/notifications.xml | 15 ----------
 .../skins/default/xui/en/panel_region_estate.xml   | 32 +++-------------------
 2 files changed, 4 insertions(+), 43 deletions(-)

(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 22896d59c3..5ebaa2364d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3797,21 +3797,6 @@ All reported abuses are investigated and resolved. You can view the resolution b
    <unique/>
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportAbuseEmailEO"
-   type="alertmodal">
-IMPORTANT: This report will go to the owner of the region you are currently in and not to Linden Lab.
-
-As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. Linden Lab will not investigate reports you file from this location.
-
-The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant.
-(View covenants by going to the World menu and selecting About Land.)
-
-The resolution of this report applies only to this Region. Residents&apos; access to other areas of [SECOND_LIFE] will not be affected by the outcome of this report. Only Linden Lab can restrict access to the entirety of [SECOND_LIFE].
-  <unique/>
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="HelpReportAbuseSelectCategory"
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index e25ff0d548..68878825ed 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -9,10 +9,6 @@
  name="Estate"
  top="320"
  width="480">
-    <panel.string
-     name="email_unsupported">
-        Feature unsupported
-    </panel.string>
     <text
      type="string"
      length="1"
@@ -81,7 +77,7 @@ regions in the estate.
     <view_border
      bevel_style="in"
      follows="top|left"
-     height="310"
+     height="275"
      layout="topleft"
      left_delta="-4"
      top_pad="5"
@@ -141,12 +137,12 @@ regions in the estate.
      name="Only Allow"
      top="250"
      width="278">
-        Restrict Access To:
+        Restrict Access to Accounts Verified by:
     </text>
     <check_box
      follows="top|left"
      height="16"
-     label="Residents with payment info on file"
+     label="Payment Information on File"
      layout="topleft"
      left_delta="0"
      name="limit_payment"
@@ -156,7 +152,7 @@ regions in the estate.
     <check_box
      follows="top|left"
      height="16"
-     label="Age-verified adults"
+     label="Age Verification"
      layout="topleft"
      left_delta="0"
      name="limit_age_verified"
@@ -179,26 +175,6 @@ regions in the estate.
      name="allow_direct_teleport"
      top_pad="4"
      width="80" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="15"
-     name="abuse_email_text"
-     top_pad="10"
-     width="180">
-        Abuse email address:
-    </text>
-    <line_editor
-     follows="top|left"
-     height="23"
-     layout="topleft"
-     left="15"
-     name="abuse_email_address"
-     top_pad="-5"
-     width="230" />
     <button
      enabled="false"
      follows="left|top"
-- 
cgit v1.2.3


From 225cd2d5a7a997c83fbce537d0e32a2b43db6f9a Mon Sep 17 00:00:00 2001
From: Soft Linden <soft@lindenlab.com>
Date: Thu, 10 Dec 2009 19:09:51 -0600
Subject: DEV-44130 Clarify AO messages on Region/Estate - Region tab

---
 indra/newview/skins/default/xui/en/notifications.xml       | 2 ++
 indra/newview/skins/default/xui/en/panel_region_estate.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(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 5ebaa2364d..3e9cbe91e0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3539,6 +3539,8 @@ Type a short announcement which will be sent to everyone in this region.
    type="alertmodal">
 The maturity rating for this region has been updated.
 It may take some time for the change to be reflected on the map.
+
+To enter Adult regions, residents must be Account Verified, either by age-verification or payment-verification.
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 68878825ed..f381c5c213 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -77,7 +77,7 @@ regions in the estate.
     <view_border
      bevel_style="in"
      follows="top|left"
-     height="275"
+     height="270"
      layout="topleft"
      left_delta="-4"
      top_pad="5"
-- 
cgit v1.2.3


From e9a744131d2c08c0c08214624e09f152e52b2731 Mon Sep 17 00:00:00 2001
From: Soft Linden <soft@lindenlab.com>
Date: Thu, 10 Dec 2009 20:39:31 -0600
Subject: DEV-44138 About Land - Access tab - make AO overriden options clear

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

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

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 d1fd42bdd9..52fda97860 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1857,6 +1857,10 @@ Select the thumbnail to choose a different texture.
          top="0"
          help_topic="land_access_tab"
          name="land_access_panel">
+			<panel.string
+			 name="access_estate_defined">
+				(Defined by the Estate)
+			</panel.string>
             <panel.string
              name="estate_override">
                 One or more of these options is set at the estate level
@@ -1877,7 +1881,7 @@ Select the thumbnail to choose a different texture.
             <check_box
              follows="top|left"
              height="16"
-             label="Allow Public Access"
+             label="Allow Public Access [MATURITY]"
              layout="topleft"
              left_delta="0"
              name="public_access"
@@ -1893,12 +1897,12 @@ Select the thumbnail to choose a different texture.
              name="Only Allow"
              top="49"
              width="278">
-                Block Access By:
+                Restrict Access to Residents verified by:
             </text>
             <check_box
              follows="top|left"
              height="16"
-             label="Residents who have not given payment info to Linden Lab"
+             label="Payment Information on File [ESTATE_PAYMENT_LIMIT]"
              layout="topleft"
              left_delta="0"
              name="limit_payment"
@@ -1908,7 +1912,7 @@ Select the thumbnail to choose a different texture.
             <check_box
              follows="top|left"
              height="16"
-             label="Residents who are not age verified adults"
+             label="Age Verification [ESTATE_AGE_LIMIT]"
              layout="topleft"
              left_delta="0"
              name="limit_age_verified"
-- 
cgit v1.2.3


From 729f3bbd340294b0ef511a341afd5cf899db55c1 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Fri, 11 Dec 2009 09:21:43 +0000
Subject: EXT-332: Added Buy L$ link for Exchange Rate.

As per the international billing team.

Just waiting for the "payment method and currency" URL now.
---
 indra/newview/skins/default/xui/en/floater_buy_currency.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 75711cdf89..26b003cafe 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -222,7 +222,7 @@
      width="300"
      height="30"
      name="currency_links">
-      [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com exchange rate]
+      [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
     </text>
     <text
      type="string"
-- 
cgit v1.2.3