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 /indra/newview/skins/default/xui/en/floater_social.xml | |
parent | 4a8579462c464bd73d79256435d08ebc4112ccf7 (diff) | |
parent | 7eae0afabc1b809a756b947c08d05f14f4b9d4e0 (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_social.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_social.xml | 1 |
1 files changed, 1 insertions, 0 deletions
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" |