From 7eae0afabc1b809a756b947c08d05f14f4b9d4e0 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 25 Jun 2013 11:47:45 -0700
Subject: ACME-585 Populate the drop-down box with picture resolutions

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d137df6b7c..fee74586e6 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12757,6 +12757,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SocialPhotoResolution</key>
+    <map>
+      <key>Comment</key>
+      <string>Default resolution when sharing photo using the social floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>[i800,i600]</string>
+    </map>  
     <key>sourceid</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 90b5bd51486e8a5cb5072974c331d1ed61b7e08b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 1 Jul 2013 15:06:30 -0700
Subject: ACME-645 : Implement the Facebook FUI button. No code, all xml
 wizardry...

---
 indra/newview/app_settings/commands.xml | 10 ++++++++++
 indra/newview/app_settings/toolbars.xml |  1 +
 2 files changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 4659673333..60c942094a 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -216,6 +216,16 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="snapshot"
            />
+  <command name="social"
+           available_in_toybox="true"
+           icon="Command_Social_Icon"
+           label_ref="Command_Social_Label"
+           tooltip_ref="Command_Social_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="social"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="social"
+           />
   <command name="speak"
            available_in_toybox="true"
            icon="Command_Speak_Icon"
diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
index 29c019719d..86f9912815 100755
--- a/indra/newview/app_settings/toolbars.xml
+++ b/indra/newview/app_settings/toolbars.xml
@@ -6,6 +6,7 @@
     <command name="speak"/>
     <command name="destinations"/>
     <command name="people"/>
+    <command name="social"/>
     <command name="profile"/>
     <command name="move"/>
     <command name="view"/>
-- 
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/app_settings/cmd_line.xml |  8 ++++++++
 indra/newview/app_settings/settings.xml | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 7ab7787d77..a6e93edc79 100755
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -164,6 +164,14 @@
       <string>UserLoginInfo</string>
     </map>
 
+    <key>logevents</key>
+    <map>
+      <key>desc</key>
+      <string>Log ui events for later playback</string>
+      <key>map-to</key>
+      <string>LogEvents</string>
+    </map>
+
     <key>logmetrics</key>
     <map>
       <key>desc</key>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 344079b640..54624e3f1d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4842,6 +4842,16 @@
       <key>Value</key>
       <array />
     </map>
+    <key>LeapPlaybackEventsCommand</key>
+    <map>
+      <key>Comment</key>
+      <string>Command line to use leap to launch playback of event recordings</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>LLSD</string>
+      <key>Value</key>
+    </map>
     <key>LSLFindCaseInsensitivity</key>
         <map>
         <key>Comment</key>
@@ -10105,6 +10115,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowEventRecorderMenuItems</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not Event Recorder menu choices - Start / Stop event recording should appear in the (currently) Develop menu</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowGestureButton</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 1f6d19436e659954d766d6d3698d0bfabde4fa81 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 1 Aug 2013 15:12:58 -0700
Subject: ACME: add SLShareHost variable to settings.xml, which allows changing
 the fb service host location as needed.

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 672e323801..832610c72c 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3456,6 +3456,17 @@
         <key>Value</key>
         <integer>0</integer>
     </map>
+    <key>SLShareHost</key>
+    <map>
+      <key>Comment</key>
+      <string>Host for contacting SL FB services</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>http://int.fbc.aditi.lindenlab.com</string>
+    </map>  
     <key>FastCacheFetchEnabled</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 1abafdc8b5bf0197b2a3586737d461140e07e994 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 2 Aug 2013 14:42:03 -0700
Subject: Switching SLShareHost to pdp location

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 832610c72c..20919adc76 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3465,7 +3465,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://int.fbc.aditi.lindenlab.com</string>
+      <string>http://pdp15.lindenlab.com</string>
     </map>  
     <key>FastCacheFetchEnabled</key>
     <map>
-- 
cgit v1.2.3


From d0e964289ec9888686619c4edd756edd622ca214 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 13 Aug 2013 01:47:20 +0100
Subject: added read_from_master parameter for ACME-829

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 20919adc76..bebd1fd9e8 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3465,7 +3465,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://pdp15.lindenlab.com</string>
+      <string></string>
     </map>  
     <key>FastCacheFetchEnabled</key>
     <map>
-- 
cgit v1.2.3


From ecc4f2357df4cc139aa4e6a6a22f1ac5460f6871 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 26 Aug 2013 16:42:31 -0400
Subject: remove unused --logevents command line option because new validation
 causes unmapped options to be errors

---
 indra/newview/app_settings/cmd_line.xml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 789a07fbe2..a9f6079630 100755
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -177,14 +177,6 @@
       <string>UserLoginInfo</string>
     </map>
 
-    <key>logevents</key>
-    <map>
-      <key>desc</key>
-      <string>Log ui events for later playback</string>
-      <key>map-to</key>
-      <string>LogEvents</string>
-    </map>
-
     <key>logmetrics</key>
     <map>
       <key>desc</key>
-- 
cgit v1.2.3


From 3ba9cf20486ac80276f262c57a9280dc875504eb Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 3 Sep 2013 19:11:20 -0700
Subject: ACME-789: Remove SLShareHost setting from settings.xml

---
 indra/newview/app_settings/settings.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 098693eb98..b199929d91 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3533,17 +3533,6 @@
         <key>Value</key>
         <integer>0</integer>
     </map>
-    <key>SLShareHost</key>
-    <map>
-      <key>Comment</key>
-      <string>Host for contacting SL FB services</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string></string>
-    </map>  
     <key>FastCacheFetchEnabled</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3