From 68c7cd2a10786856e52d4b23334c9d0496956d62 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 22 Sep 2009 16:25:50 -0400
Subject: ND-37009: re-add Pth to list of licenses in floater_about.xml

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 73d789ce89..eaf25056c1 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -89,16 +89,17 @@
   expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
   FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
   GL Copyright (C) 1999-2004 Brian Paul.
+  google-perftools Copyright (c) 2005, Google Inc.
   Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
   jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
   jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
   ogg/vorbis Copyright (C) 2001, Xiphophorus
   OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+  Pth Copyright (C) 1999-2006 Ralf S. Engelschall &lt;rse@gnu.org&gt;
   SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
   SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
   zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-  google-perftools Copyright (c) 2005, Google Inc.
 
   All rights reserved.  See licenses.txt for details.
 
-- 
cgit v1.2.3


From a2dcfdb00e6d4ec719b17de73fddd8569f58a80d Mon Sep 17 00:00:00 2001
From: skolb <none@none>
Date: Mon, 5 Oct 2009 11:56:17 -0700
Subject: DEV-39444 Media size only goes to 2000 x 2000

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index b66aad1853..4e214c4095 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -185,7 +185,7 @@
   <spinner bottom_delta="0"
 	     decimal_digits="0" enabled="true" follows="left|top" height="16"
 	     increment="1" initial_val="256" label="" label_width="0"
-	     left_delta="40" max_val="2000" min_val="0" mouse_opaque="true"
+	     left_delta="40" max_val="2048" min_val="0" mouse_opaque="true"
 	     name="width_pixels" width="50" />
   <text bottom_delta="0" follows="top|left" height="15" left_delta="60" name="">
     X
@@ -193,7 +193,7 @@
   <spinner bottom_delta="0"
 	     decimal_digits="0" enabled="true" follows="left|top" height="16"
 	     increment="1" initial_val="256" label="" label_width="0"
-	     left_delta="20" max_val="2000" min_val="0" mouse_opaque="true"
+	     left_delta="20" max_val="2048" min_val="0" mouse_opaque="true"
 	     name="height_pixels" width="50" />
  
 </panel>
-- 
cgit v1.2.3


From 3831ca912eb8b78ccdcfac7d37c015ca45351c83 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 15 Oct 2009 11:29:14 -0700
Subject: https://jira.lindenlab.com/jira/browse/DEV-40649 Media auto refreshes
 after Whitelist set This checkin fixes a related issue to this task and
 prohibits user from (A) adding an item to the whitelist that would invalidate
 the home URL and (b) adding a home URL that would not pass the whitelist.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f141a909a8..4c90d9ee8a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -659,6 +659,19 @@ To place the media on only one face, choose Select Texture and click on the desi
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="WhiteListInvalidatesHomeUrl"
+   type="alertmodal">
+Adding this entry to the whitelist will invalidate the home URL you
+specified for this instance of media. You are not allowed to do this
+so the entry cannot be added to the whitelist.
+    <usetemplate
+     name="okbutton"
+     yestext="Ok"/>
+  </notification>
+
+
   <notification
    icon="alertmodal.tga"
    name="MustBeInParcel"
-- 
cgit v1.2.3


From 90378004089e35f54301ee9b348a39d87e7b6f40 Mon Sep 17 00:00:00 2001
From: Steve Bennetts <steve@lindenlab.com>
Date: Thu, 15 Oct 2009 18:07:39 -0700
Subject: EXT-651 - Added Upload Image shortcut to Advanced > Keyboard
 Shortcuts. Also cleaned up that menu a little.

--HG--
branch : branch-test
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 78 +++++++++++-----------
 1 file changed, 38 insertions(+), 40 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b0839ce255..52a0877b6e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1065,34 +1065,46 @@
                layout="topleft"
                name="Search"
                shortcut="control|F">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="search" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="search" />
+              <menu_item_check.on_check
+				 function="Floater.Visible"
+				 parameter="search" />
+              <menu_item_check.on_click
+				 function="Floater.Toggle"
+				 parameter="search" />
             </menu_item_check>
             <menu_item_call
-             enabled="false"
-             label="Release Keys"
+               label="Upload Image (L$[COST])..."
+               layout="topleft"
+               name="Upload Image"
+               shortcut="control|U">
+              <menu_item_call.on_click
+                 function="File.UploadImage"
+                 parameter="" />
+              <menu_item_call.on_enable
+                 function="File.EnableUpload" />
+            </menu_item_call>
+            <menu_item_separator/>
+            <menu_item_call
+             label="Close Window"
              layout="topleft"
-             name="Release Keys">
+             name="Close Window"
+             shortcut="control|W">
                 <menu_item_call.on_click
-                 function="Tools.ReleaseKeys"
-                 parameter="" />
+                 function="File.CloseWindow" />
                 <menu_item_call.on_enable
-                 function="Tools.EnableReleaseKeys"
-                 parameter="" />
+                 function="File.EnableCloseWindow" />
             </menu_item_call>
             <menu_item_call
-             label="Set UI Size to Default"
+             label="Close All Windows"
              layout="topleft"
-             name="Set UI Size to Default">
+             name="Close All Windows"
+             shortcut="control|shift|W">
                 <menu_item_call.on_click
-                 function="View.DefaultUISize" />
+                 function="File.CloseAllWindows" />
+                <menu_item_call.on_enable
+                 function="File.EnableCloseAllWindows" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
              label="Always Run"
              layout="topleft"
@@ -1113,28 +1125,6 @@
                 <menu_item_check.on_enable
                  function="Agent.enableFlying" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Close Window"
-             layout="topleft"
-             name="Close Window"
-             shortcut="control|W">
-                <menu_item_call.on_click
-                 function="File.CloseWindow" />
-                <menu_item_call.on_enable
-                 function="File.EnableCloseWindow" />
-            </menu_item_call>
-            <menu_item_call
-             label="Close All Windows"
-             layout="topleft"
-             name="Close All Windows"
-             shortcut="control|shift|W">
-                <menu_item_call.on_click
-                 function="File.CloseAllWindows" />
-                <menu_item_call.on_enable
-                 function="File.EnableCloseAllWindows" />
-            </menu_item_call>
             <menu_item_separator
              layout="topleft" />
             <menu_item_call
@@ -1305,6 +1295,14 @@
             <menu_item_call.on_click
              function="Advanced.RebakeTextures" />
         </menu_item_call>
+        <menu_item_call
+           label="Set UI Size to Default"
+           layout="topleft"
+           name="Set UI Size to Default">
+          <menu_item_call.on_click
+             function="View.DefaultUISize" />
+        </menu_item_call>
+        <menu_item_separator/>
         <menu_item_check
          label="Limit Select Distance"
          layout="topleft"
-- 
cgit v1.2.3