From e970fa7f1ce9190b8a26e72bebbcceed04fb7494 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 30 Jan 2014 18:53:05 -0800
Subject: ACME-1293 : Use notification to signal from the snapshot panel to its
 container rather than grabbing global instances, use unique control_name for
 widgets, fix Post button visibility on Twitter

---
 indra/newview/skins/default/xui/en/panel_facebook_photo.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_flickr_photo.xml   | 4 ++--
 indra/newview/skins/default/xui/en/panel_twitter_photo.xml  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
index 0a90d000bd..0cde43a20c 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -15,7 +15,7 @@
          name="snapshot_panel"
          height="367">
             <combo_box
-             control_name="SocialPhotoResolution"
+             control_name="FacebookPhotoResolution"
              follows="left|top"
              top="6"
              left="9"
@@ -45,7 +45,7 @@
                value="[i1200,i630]" />
             </combo_box>
             <combo_box
-                control_name="SocialPhotoFilters"
+                control_name="FacebookPhotoFilters"
                 follows="right|top"
                 name="filters_combobox"
                 tool_tip="Image filters"
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 47ddecdf38..01116c6c4c 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -15,7 +15,7 @@
          name="snapshot_panel"
          height="507">
             <combo_box
-             control_name="SocialPhotoResolution"
+             control_name="FlickrPhotoResolution"
              follows="left|top"
              top="6"
              left="9"
@@ -41,7 +41,7 @@
                value="[i1024,i768]" />
             </combo_box>
             <combo_box
-               control_name="SocialPhotoFilters"
+               control_name="FlickrPhotoFilters"
                follows="right|top"
                name="filters_combobox"
                tool_tip="Image filters"
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index e044dbdf55..bcec09ebab 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -71,7 +71,7 @@
            name="snapshot_panel"
            height="227">
             <combo_box
-             control_name="SocialPhotoResolution"
+             control_name="TwitterPhotoResolution"
              follows="left|top"
              top="6"
              left="9"
@@ -97,7 +97,7 @@
                value="[i1024,i768]" />
             </combo_box>
               <combo_box
-                  control_name="SocialPhotoFilters"
+                  control_name="TwitterPhotoFilters"
                   follows="right|top"
                   name="filters_combobox"
                   tool_tip="Image filters"
-- 
cgit v1.2.3