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 +++++++++++
 indra/newview/skins/default/xui/en/floater_social.xml |  1 +
 2 files changed, 12 insertions(+)

(limited to 'indra/newview')

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>
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 1ae8f7ed65..f8ab2000cf 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -108,6 +108,7 @@
             help_topic="snapshot_panel"
             name="snapshot_panel">
             <combo_box
+             control_name="SocialPhotoResolution"
              follows="left|top"
              top="6"
              left="9"
-- 
cgit v1.2.3