diff options
| author | Cho <cho@lindenlab.com> | 2013-06-25 19:49:38 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-06-25 19:49:38 +0100 |
| commit | 5d1ff91b66b731ec93f2e46c58e8e799e1a0c2fe (patch) | |
| tree | 0d0059890c0f7553e9fe56213d1a21efcd7d1cc8 | |
| parent | 4a8579462c464bd73d79256435d08ebc4112ccf7 (diff) | |
| parent | 7eae0afabc1b809a756b947c08d05f14f4b9d4e0 (diff) | |
merge
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_social.xml | 1 |
2 files changed, 12 insertions, 0 deletions
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 3b19a2f4cb..76c15b9624 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" |