From 8748fdf77c3b1b1374b436cd7f4f03ce7575e7ba Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 18 Jun 2013 11:00:30 -0700
Subject: CHUI 560: Missed adding floater_social.xml file

---
 indra/newview/skins/default/xui/en/floater_social.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_social.xml

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
new file mode 100644
index 0000000000..c9b5d3a4df
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+  positioning="cascading"
+  can_close="true"
+  can_resize="true"
+  height="570"
+  help_topic="social floater"
+  min_height="220"
+  min_width="260"
+  layout="topleft"
+  name="floater_social"
+  save_rect="true"
+  single_instance="true"
+  reuse_instance="true"
+  title="FACEBOOK"
+  width="370">
+</floater>
-- 
cgit v1.2.3


From 0a119a3dc9d5bf593c375948491728ded8241981 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 18 Jun 2013 17:00:16 -0700
Subject: ACME-561 Create tabs for the status, photo and place

---
 .../skins/default/xui/en/floater_social.xml        | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index c9b5d3a4df..2b730c1a18 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -15,4 +15,62 @@
   reuse_instance="true"
   title="FACEBOOK"
   width="370">
+  <tab_container
+   bottom="-7"
+   follows="all"
+   layout="topleft"
+   left="4"
+   name="tabs"
+   tab_group="1"
+   tab_min_width="70"
+   tab_height="30"
+   tab_position="top"
+   top="4"
+   halign="center"
+   right="-5">
+    <panel
+     background_opaque="true"
+     background_visible="true"
+     bg_alpha_color="DkGray"
+     bg_opaque_color="DkGray"
+     bottom="0"
+     follows="all"
+     label="STATUS"
+     layout="topleft"
+     left="0"
+     help_topic="social_status_tab"
+     name="status_panel"
+     right="0"
+     top="0"/>
+    <panel
+      background_opaque="true"
+      background_visible="true"
+      bg_alpha_color="DkGray"
+      bg_opaque_color="DkGray"
+      bottom="0"
+      follows="all"
+      label="PHOTO"
+      layout="topleft"
+      left="0"
+      help_topic="social_photo_tab"
+      name="photo_panel"
+      right="0"
+      top="0"/>
+    <panel
+      background_opaque="true"
+      background_visible="true"
+      bg_alpha_color="DkGray"
+      bg_opaque_color="DkGray"
+      bottom="0"
+      follows="all"
+      label="PLACE"
+      layout="topleft"
+      left="0"
+      help_topic="social_place_tab"
+      name="place_panel"
+      right="0"
+      top="0"/>
+   </tab_container>
+  
+  
 </floater>
-- 
cgit v1.2.3


From a88be82d27dd3226356a71cdda88093490a326c5 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 18 Jun 2013 18:56:17 -0700
Subject: ACME-561 Adjusted the size of the floater to better match spec. Also
 made the floater non-sizable and the tabs spread nearly evenly across. Can
 touch up UI in another iteration and after some feedback.

---
 indra/newview/skins/default/xui/en/floater_social.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 2b730c1a18..7814c8e64f 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -3,8 +3,8 @@
 <floater
   positioning="cascading"
   can_close="true"
-  can_resize="true"
-  height="570"
+  can_resize="false"
+  height="470"
   help_topic="social floater"
   min_height="220"
   min_width="260"
@@ -14,15 +14,15 @@
   single_instance="true"
   reuse_instance="true"
   title="FACEBOOK"
-  width="370">
+  width="314">
   <tab_container
-   bottom="-7"
+   bottom="-1"
    follows="all"
    layout="topleft"
    left="4"
    name="tabs"
    tab_group="1"
-   tab_min_width="70"
+   tab_min_width="98"
    tab_height="30"
    tab_position="top"
    top="4"
@@ -33,7 +33,7 @@
      background_visible="true"
      bg_alpha_color="DkGray"
      bg_opaque_color="DkGray"
-     bottom="0"
+     bottom="-1"
      follows="all"
      label="STATUS"
      layout="topleft"
@@ -47,7 +47,7 @@
       background_visible="true"
       bg_alpha_color="DkGray"
       bg_opaque_color="DkGray"
-      bottom="0"
+      bottom="-1"
       follows="all"
       label="PHOTO"
       layout="topleft"
@@ -61,7 +61,7 @@
       background_visible="true"
       bg_alpha_color="DkGray"
       bg_opaque_color="DkGray"
-      bottom="0"
+      bottom="-1"
       follows="all"
       label="PLACE"
       layout="topleft"
-- 
cgit v1.2.3


From f1e594feceb8ab284e023e164d5410cd53a656cb Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Wed, 19 Jun 2013 10:18:40 -0700
Subject: ACME-561 Left justified the tabs per UX

---
 indra/newview/skins/default/xui/en/floater_social.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 7814c8e64f..313706dbc0 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -22,7 +22,7 @@
    left="4"
    name="tabs"
    tab_group="1"
-   tab_min_width="98"
+   tab_min_width="70"
    tab_height="30"
    tab_position="top"
    top="4"
-- 
cgit v1.2.3


From 50bb863be1c0e3528fd850aac812fc6196a7c4fc Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 20 Jun 2013 16:39:08 -0700
Subject: ACME-584 Create the panel to contain the image details

---
 .../skins/default/xui/en/floater_social.xml        | 296 ++++++++++++++++++---
 1 file changed, 260 insertions(+), 36 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 313706dbc0..2b382215d1 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -4,73 +4,297 @@
   positioning="cascading"
   can_close="true"
   can_resize="false"
-  height="470"
   help_topic="social floater"
-  min_height="220"
-  min_width="260"
   layout="topleft"
   name="floater_social"
   save_rect="true"
   single_instance="true"
   reuse_instance="true"
   title="FACEBOOK"
-  width="314">
+  height="437"
+  width="304">
   <tab_container
-   bottom="-1"
-   follows="all"
-   layout="topleft"
-   left="4"
    name="tabs"
    tab_group="1"
    tab_min_width="70"
    tab_height="30"
    tab_position="top"
-   top="4"
-   halign="center"
-   right="-5">
+   top="7"
+   height="430"
+   halign="center">
     <panel
      background_opaque="true"
      background_visible="true"
      bg_alpha_color="DkGray"
      bg_opaque_color="DkGray"
-     bottom="-1"
-     follows="all"
      label="STATUS"
-     layout="topleft"
-     left="0"
      help_topic="social_status_tab"
-     name="status_panel"
-     right="0"
-     top="0"/>
+     name="status_panel"/>
     <panel
-      background_opaque="true"
+      follows="all"
+      height="430"
       background_visible="true"
       bg_alpha_color="DkGray"
       bg_opaque_color="DkGray"
-      bottom="-1"
-      follows="all"
       label="PHOTO"
-      layout="topleft"
-      left="0"
       help_topic="social_photo_tab"
-      name="photo_panel"
-      right="0"
-      top="0"/>
+      name="photo_panel">
+      <layout_stack
+       border_size="0"
+       height="422"
+       follows="all"
+       orientation="vertical"
+       name="stack1"
+       top="8">
+        <layout_panel
+         name="photo_panel"
+         height="295">
+          <panel
+            top="0"
+            follows="all"
+            height="295"
+            width="286"
+            left="7"
+            background_opaque="true"
+            background_visible="true"
+            bg_opaque_color="DkGray2"
+            label="SNAPSHOT CONTAINER"
+            help_topic="snapshot_panel"
+            name="snapshot_panel">
+            <combo_box
+             follows="left|top"
+             top="6"
+             left="9"
+             name="resolution_combobox"
+             tool_tip="Image resolution"
+             height="21"
+             width="135">
+              <combo_box.item
+               label="Current Window"
+               name="CurrentWindow"
+               value="[i0,i0]" />
+              <combo_box.item
+               label="640x480"
+               name="640x480"
+               value="[i640,i480]" />
+              <combo_box.item
+               label="800x600"
+               name="800x600"
+               value="[i800,i600]" />
+              <combo_box.item
+               label="1024x768"
+               name="1024x768"
+               value="[i1024,i768]" />
+              <combo_box.item
+               label="Custom"
+               name="Custom"
+               value="[i-1,i-1]" />
+            </combo_box>
+            <text
+             follows="left|top"
+             font="SansSerifSmall"
+             height="14"
+             left="208"
+             length="1"
+             halign="right"
+             name="file_size_label"
+             top="12"
+             type="string"
+             width="50">
+              1,031 KB
+            </text>
+            <ui_ctrl
+              height="150"
+              width="250"
+              name="thumbnail_placeholder"
+              top_pad="5"
+              follows="left|top"
+              left="9">
+              <panel
+               background_visible="true"
+               bg_alpha_color="0.9 1 0.9 1"
+               follows="left|top"
+               font="SansSerifLarge"
+               halign="center"
+               height="20"
+               left="0"
+               length="1"
+               name="succeeded_panel"
+               right="-1"
+               top="0"
+               type="string"
+               visible="true">
+                <text
+                 follows="all"
+                 font="SansSerif"
+                 halign="center"
+                 height="18"
+                 left="1"
+                 length="1"
+                 name="succeeded_lbl"
+                 right="-1"
+                 text_color="0.2 0.5 0.2 1"
+                 top="4"
+                 translate="false"
+                 type="string">
+                  Succeeded
+                </text>
+              </panel>
+              <panel
+               background_visible="true"
+               bg_alpha_color="1 0.9 0.9 1"
+               follows="left|top"
+               font="SansSerifLarge"
+               halign="center"
+               height="20"
+               left_delta="0"
+               length="1"
+               name="failed_panel"
+               right="-1"
+               top="0"
+               type="string"
+               visible="true">
+                <text
+                 follows="all"
+                 font="SansSerif"
+                 halign="center"
+                 height="18"
+                 left="1"
+                 length="1"
+                 name="failed_lbl"
+                 right="-1"
+                 text_color="0.5 0.2 0.2 1"
+                 top="4"
+                 translate="false"
+                 type="string">
+                  Failed
+                </text>
+              </panel>
+              <loading_indicator
+               follows="left|top"
+               height="48"
+               name="working_indicator"
+               left="101"
+               top="46"
+               visible="true"
+               width="48" />
+              <text
+               follows="left|top|right"
+               font="SansSerifBold"
+               height="14"
+               left="5"
+               length="1"
+               halign="center"
+               name="working_lbl"
+               right="-5"
+               top="98"
+               translate="false"
+               type="string"
+               visible="true"
+               width="130">
+                Working
+              </text>
+              <button
+               follows="left|top"
+               height="22"
+               image_overlay="Refresh_Off"
+               left="6"
+               name="new_snapshot_btn"
+               bottom="-6"
+               visible="true"
+               width="22" />
+              <text
+               follows="left|top"
+               font="SansSerifBold"
+               height="18"
+               left_pad="6"
+               length="1"
+               name="refresh_lbl"
+               text_color="red"
+               top_delta="5"
+               translate="false"
+               type="string"
+               visible="true"
+               width="130">
+                Refresh to save.
+              </text>
+            </ui_ctrl>
+            <text
+             length="1"
+             follows="top|left|right"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="caption_label"
+             top_pad="12"
+             type="string">
+              Comment (optional):
+            </text>
+            <text_editor
+             follows="left|top"
+             height="47"
+             width="250"
+             left="9"
+             length="1"
+             max_length="700"
+             name="caption"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <check_box
+             follows="left|top"
+             initial_value="true"
+             label="Include location in posting"
+             name="add_location_cb"
+             top_pad="19"/>            
+            </panel>
+        </layout_panel>
+        <layout_panel
+          name="button_panel"
+          height="96">
+          <panel
+            height="96"
+            top="0"
+            follows="all"
+            left="7"
+            right="-10"
+            background_opaque="true"
+            background_visible="true"
+            bg_opaque_color="DkGray"
+            label="SNAPSHOT CONTAINER"
+            help_topic="snapshot_container"
+            name="snapshot_container"/>
+          <button
+           follows="left|top"
+           top="15"
+           height="23"
+           label="Post"
+           name="post_btn"
+           width="100">
+            <button.commit_callback
+             function="PostToFacebook.Send" />
+          </button>
+          <button
+               follows="left|top"
+               height="23"
+               label="Cancel"
+               name="cancel_btn"
+               left_pad="15"
+               top_delta="0"
+               width="100">
+            <button.commit_callback
+             function="PostToFacebook.Cancel" />
+          </button>          
+        </layout_panel>        
+      </layout_stack>
+    </panel>
     <panel
       background_opaque="true"
       background_visible="true"
       bg_alpha_color="DkGray"
       bg_opaque_color="DkGray"
-      bottom="-1"
-      follows="all"
       label="PLACE"
-      layout="topleft"
-      left="0"
       help_topic="social_place_tab"
-      name="place_panel"
-      right="0"
-      top="0"/>
-   </tab_container>
-  
-  
+      name="place_panel"/>
+  </tab_container>
 </floater>
-- 
cgit v1.2.3


From 824a5c65f57ae0fa2cce99ade156341fcf8daf5a Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 20 Jun 2013 17:58:27 -0700
Subject: ACME-584: Adjusted name of a couple XUI elements.

---
 indra/newview/skins/default/xui/en/floater_social.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 2b382215d1..d446e0c0f6 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -47,7 +47,7 @@
        name="stack1"
        top="8">
         <layout_panel
-         name="photo_panel"
+         name="photo_detail_panel"
          height="295">
           <panel
             top="0"
@@ -58,7 +58,7 @@
             background_opaque="true"
             background_visible="true"
             bg_opaque_color="DkGray2"
-            label="SNAPSHOT CONTAINER"
+            label="snapshot_panel"
             help_topic="snapshot_panel"
             name="snapshot_panel">
             <combo_box
@@ -250,7 +250,7 @@
             </panel>
         </layout_panel>
         <layout_panel
-          name="button_panel"
+          name="photo_button_panel"
           height="96">
           <panel
             height="96"
@@ -261,9 +261,9 @@
             background_opaque="true"
             background_visible="true"
             bg_opaque_color="DkGray"
-            label="SNAPSHOT CONTAINER"
-            help_topic="snapshot_container"
-            name="snapshot_container"/>
+            label="button_container"
+            help_topic="button_container"
+            name="button_container"/>
           <button
            follows="left|top"
            top="15"
-- 
cgit v1.2.3


From ba8bced90b0a3e5126e3274ac4d8a9f611a9ded8 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 21 Jun 2013 12:45:20 -0700
Subject: ACME-588 Make 'Post' button post to facebook: Intial commit is just
 adding callback for clicking the post button

---
 indra/newview/skins/default/xui/en/floater_social.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index d446e0c0f6..8141961273 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -31,6 +31,7 @@
      help_topic="social_status_tab"
      name="status_panel"/>
     <panel
+      class="llsocialphotopanel"
       follows="all"
       height="430"
       background_visible="true"
@@ -38,7 +39,7 @@
       bg_opaque_color="DkGray"
       label="PHOTO"
       help_topic="social_photo_tab"
-      name="photo_panel">
+      name="social_photo_tab">
       <layout_stack
        border_size="0"
        height="422"
-- 
cgit v1.2.3


From 835ea6dcae7d1394b62efb6a66b948cdd19da6d9 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 22 Jun 2013 01:23:14 +0100
Subject: added text and buttons for update status tab for ACME-568

---
 .../skins/default/xui/en/floater_social.xml        | 46 +++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 8141961273..378841b1a6 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -29,7 +29,51 @@
      bg_opaque_color="DkGray"
      label="STATUS"
      help_topic="social_status_tab"
-     name="status_panel"/>
+     name="status_panel">
+      <text
+        length="1"
+        follows="top|left|right"
+        font="SansSerif"
+        height="16"
+        left="9"
+        name="caption_label"
+        top_pad="12"
+        type="string">
+        What's on your mind?
+      </text>
+      <text_editor
+        follows="left|top"
+        height="47"
+        width="250"
+        left="9"
+        length="1"
+        max_length="700"
+        name="caption"
+        type="string"
+        word_wrap="true">
+      </text_editor>
+      <button
+        follows="left|top"
+        height="23"
+        label="Post"
+        name="post_btn"
+        top_pad="12"
+        width="100">
+        <button.commit_callback
+          function="PostToFacebook.Send" />
+      </button>
+      <button
+        follows="left|top"
+        height="23"
+        label="Cancel"
+        name="cancel_btn"
+        left_pad="15"
+        top_delta="0"
+        width="100">
+        <button.commit_callback
+          function="PostToFacebook.Cancel" />
+      </button>
+    </panel>
     <panel
       class="llsocialphotopanel"
       follows="all"
-- 
cgit v1.2.3


From fc33dadc13c27aee58e4b3e488a9b9078af03d09 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 22 Jun 2013 01:32:15 +0100
Subject: tweaked numbers to look more like mockup for ACME-568

---
 indra/newview/skins/default/xui/en/floater_social.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 378841b1a6..c49749840b 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -37,14 +37,14 @@
         height="16"
         left="9"
         name="caption_label"
-        top_pad="12"
+        top_pad="18"
         type="string">
         What's on your mind?
       </text>
       <text_editor
         follows="left|top"
-        height="47"
-        width="250"
+        height="80"
+        width="280"
         left="9"
         length="1"
         max_length="700"
@@ -57,7 +57,7 @@
         height="23"
         label="Post"
         name="post_btn"
-        top_pad="12"
+        top_pad="18"
         width="100">
         <button.commit_callback
           function="PostToFacebook.Send" />
-- 
cgit v1.2.3


From 9debe1787f966efd6c25ffc43a3a77553aca107a Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 22 Jun 2013 11:49:36 -0700
Subject: ACME-497 : All xml work for the Checkin feature

---
 .../skins/default/xui/en/floater_social.xml        | 112 ++++++++++++++++++++-
 1 file changed, 109 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index d446e0c0f6..2909da295d 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -283,18 +283,124 @@
                top_delta="0"
                width="100">
             <button.commit_callback
-             function="PostToFacebook.Cancel" />
+             function="SocialSharing.Cancel" />
           </button>          
         </layout_panel>        
       </layout_stack>
     </panel>
     <panel
-      background_opaque="true"
+      follows="all"
+      height="430"
       background_visible="true"
       bg_alpha_color="DkGray"
       bg_opaque_color="DkGray"
       label="PLACE"
       help_topic="social_place_tab"
-      name="place_panel"/>
+      name="place_panel">
+      <layout_stack
+        border_size="0"
+        height="422"
+        follows="all"
+        orientation="vertical"
+        name="stack_place"
+        top="8">
+        <layout_panel
+          name="place_detail_panel"
+          height="122">
+          <text
+            length="1"
+            follows="top|left|right"
+            font="SansSerif"
+            height="16"
+            left="9"
+            name="place_caption_label"
+            top_pad="12"
+            type="string">
+            Say something about where you are:
+          </text>
+          <text_editor
+            follows="top|left|right"
+            height="94"
+            right="-9"
+            left="9"
+            length="1"
+            max_length="700"
+            name="place_caption"
+            type="string"
+            word_wrap="true">
+           </text_editor>
+          </layout_panel>
+          <layout_panel
+            name="place_map_panel"
+            height="133">
+            <ui_ctrl
+             height="128"
+             width="128"
+             name="map_placeholder"
+             top_pad="5"
+             follows="left|top"
+             left="9">
+             <panel
+               background_visible="true"
+               border_image="Badge_Border"
+               border_color="BadgeBorderColor"
+               bg_alpha_color="0.9 1 0.9 1"
+               follows="left|top"
+               halign="center"
+               height="128"
+               width="128"
+               left="0"
+               top="0"
+               name="map_panel"
+               visible="true"/>
+              </ui_ctrl>
+              <check_box
+                follows="left|top"
+                initial_value="true"
+                top_delta="8"
+                width="8"
+                label=""
+                name="add_place_view_cb"
+                left_pad="5"/>
+              <text
+              follows="left|top"
+              font="SansSerif"
+              height="32"
+              width="130"
+              word_wrap="true"
+              left_pad="12"
+              top_delta="-8"
+              type="string">
+              Include overhead view of location
+              </text>
+            </layout_panel>
+            <layout_panel
+              name="place_button_panel"
+              height="96">
+              <button
+                follows="left|top"
+                top="5"
+                left="9"
+                height="23"
+                label="Post"
+                name="post_place_btn"
+                width="100">
+                <button.commit_callback
+                 function="Facebook.Checkin" />
+               </button>
+               <button
+                 follows="left|top"
+                 height="23"
+                 label="Cancel"
+                 name="cancel_btn"
+                 left_pad="15"
+                 top_delta="0"
+                 width="100">
+                 <button.commit_callback
+                  function="SocialSharing.Cancel" />
+               </button>
+            </layout_panel>
+        </layout_stack>
+    </panel>
   </tab_container>
 </floater>
-- 
cgit v1.2.3


From 27bd181a6d07b191d674870039b2801713c554f1 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sun, 23 Jun 2013 12:15:21 -0700
Subject: ACME-497 : Working implementation of Checkin though couple of bugs to
 fix and no visible map in the UI

---
 indra/newview/skins/default/xui/en/floater_social.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index d57bc157cd..f99044b233 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -71,7 +71,7 @@
         top_delta="0"
         width="100">
         <button.commit_callback
-          function="PostToFacebook.Cancel" />
+          function="SocialSharing.Cancel" />
       </button>
     </panel>
     <panel
@@ -334,6 +334,7 @@
       </layout_stack>
     </panel>
     <panel
+      class="llsocialcheckinpanel"
       follows="all"
       height="430"
       background_visible="true"
@@ -431,7 +432,7 @@
                 name="post_place_btn"
                 width="100">
                 <button.commit_callback
-                 function="Facebook.Checkin" />
+                 function="SocialSharing.SendCheckin" />
                </button>
                <button
                  follows="left|top"
-- 
cgit v1.2.3


From 37fcb81c4ab8806a52ef747e6a3047fff2d6eccf Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 24 Jun 2013 13:32:13 -0700
Subject: ACME-497 : Clean up the xml code for checkin to use a proper icon
 widget and add a decent default image for it

---
 .../skins/default/xui/en/floater_social.xml        | 103 +++++++++------------
 1 file changed, 46 insertions(+), 57 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index f99044b233..fc26ba5842 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -379,36 +379,25 @@
           <layout_panel
             name="place_map_panel"
             height="133">
-            <ui_ctrl
-             height="128"
-             width="128"
-             name="map_placeholder"
-             top_pad="5"
-             follows="left|top"
-             left="9">
-             <panel
-               background_visible="true"
-               border_image="Badge_Border"
-               border_color="BadgeBorderColor"
-               bg_alpha_color="0.9 1 0.9 1"
-               follows="left|top"
-               halign="center"
-               height="128"
-               width="128"
-               left="0"
-               top="0"
-               name="map_panel"
-               visible="true"/>
-              </ui_ctrl>
-              <check_box
-                follows="left|top"
-                initial_value="true"
-                top_delta="8"
-                width="8"
-                label=""
-                name="add_place_view_cb"
-                left_pad="5"/>
-              <text
+            <icon
+              follows="left|top"
+              height="128"
+              width="128"
+              image_name="Map_Placeholder_Icon"
+              layout="topleft"
+              top="5"
+              left="9"
+              name="map_placeholder">
+            </icon>
+            <check_box
+              follows="left|top"
+              initial_value="true"
+              top_delta="8"
+              width="8"
+              label=""
+              name="add_place_view_cb"
+              left_pad="5"/>
+            <text
               follows="left|top"
               font="SansSerif"
               height="32"
@@ -418,35 +407,35 @@
               top_delta="-8"
               type="string">
               Include overhead view of location
-              </text>
-            </layout_panel>
-            <layout_panel
-              name="place_button_panel"
-              height="96">
-              <button
-                follows="left|top"
-                top="5"
-                left="9"
-                height="23"
-                label="Post"
-                name="post_place_btn"
-                width="100">
-                <button.commit_callback
+            </text>
+          </layout_panel>
+          <layout_panel
+            name="place_button_panel"
+            height="96">
+            <button
+              follows="left|top"
+              top="5"
+              left="9"
+              height="23"
+              label="Post"
+              name="post_place_btn"
+              width="100">
+              <button.commit_callback
                  function="SocialSharing.SendCheckin" />
-               </button>
-               <button
-                 follows="left|top"
-                 height="23"
-                 label="Cancel"
-                 name="cancel_btn"
-                 left_pad="15"
-                 top_delta="0"
-                 width="100">
-                 <button.commit_callback
+            </button>
+            <button
+              follows="left|top"
+              height="23"
+              label="Cancel"
+              name="cancel_btn"
+              left_pad="15"
+              top_delta="0"
+              width="100">
+              <button.commit_callback
                   function="SocialSharing.Cancel" />
-               </button>
-            </layout_panel>
-        </layout_stack>
+            </button>
+        </layout_panel>
+     </layout_stack>
     </panel>
   </tab_container>
 </floater>
-- 
cgit v1.2.3


From 68fa34965daa5bd65aea5cb1f4dc4554e7d9f70f Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 25 Jun 2013 00:26:10 +0100
Subject: made status update actually post to Facebook, for ACME-569 and
 ACME-573

---
 indra/newview/skins/default/xui/en/floater_social.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index fc26ba5842..15e105f67d 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -23,6 +23,7 @@
    height="430"
    halign="center">
     <panel
+     class="llsocialstatuspanel"
      background_opaque="true"
      background_visible="true"
      bg_alpha_color="DkGray"
@@ -48,7 +49,7 @@
         left="9"
         length="1"
         max_length="700"
-        name="caption"
+        name="message"
         type="string"
         word_wrap="true">
       </text_editor>
@@ -60,7 +61,7 @@
         top_pad="18"
         width="100">
         <button.commit_callback
-          function="PostToFacebook.Send" />
+          function="SocialSharing.SendStatus" />
       </button>
       <button
         follows="left|top"
-- 
cgit v1.2.3


From 48cc41a0f8b7b2473e938b1cac8cd294b71d40f7 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 24 Jun 2013 17:33:10 -0700
Subject: ACME-593: Now the photo tab of the facebook panel displays a
 screenshot based upon when the facebook floater was opened.

---
 .../skins/default/xui/en/floater_social.xml        | 34 ++++++++++++----------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index f99044b233..dc505fb200 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -149,12 +149,12 @@
               1,031 KB
             </text>
             <ui_ctrl
-              height="150"
-              width="250"
-              name="thumbnail_placeholder"
-              top_pad="5"
-              follows="left|top"
-              left="9">
+                height="150"
+                width="250"
+                name="thumbnail_placeholder"
+                top_pad="5"
+                follows="left|top"
+                left="9">
               <panel
                background_visible="true"
                bg_alpha_color="0.9 1 0.9 1"
@@ -168,7 +168,7 @@
                right="-1"
                top="0"
                type="string"
-               visible="true">
+               visible="false">
                 <text
                  follows="all"
                  font="SansSerif"
@@ -198,7 +198,7 @@
                right="-1"
                top="0"
                type="string"
-               visible="true">
+               visible="false">
                 <text
                  follows="all"
                  font="SansSerif"
@@ -221,7 +221,7 @@
                name="working_indicator"
                left="101"
                top="46"
-               visible="true"
+               visible="false"
                width="48" />
               <text
                follows="left|top|right"
@@ -235,7 +235,7 @@
                top="98"
                translate="false"
                type="string"
-               visible="true"
+               visible="false"
                width="130">
                 Working
               </text>
@@ -243,23 +243,25 @@
                follows="left|top"
                height="22"
                image_overlay="Refresh_Off"
-               left="6"
+               left="20"
                name="new_snapshot_btn"
-               bottom="-6"
-               visible="true"
+               bottom="-20"
+               visible="false"
                width="22" />
               <text
                follows="left|top"
                font="SansSerifBold"
+               halign="left"
                height="18"
-               left_pad="6"
+               left_pad="10"
                length="1"
                name="refresh_lbl"
+               right="-5"
                text_color="red"
-               top_delta="5"
+               top_delta="0"
                translate="false"
                type="string"
-               visible="true"
+               visible="false"
                width="130">
                 Refresh to save.
               </text>
-- 
cgit v1.2.3


From 4441edecdf27b9324b61d9e415c257e50e4909a6 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 25 Jun 2013 10:54:59 -0700
Subject: ACME-587 Add the 'refresh' button on top the image

---
 indra/newview/skins/default/xui/en/floater_social.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 5c910ad986..1ae8f7ed65 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -131,10 +131,6 @@
                label="1024x768"
                name="1024x768"
                value="[i1024,i768]" />
-              <combo_box.item
-               label="Custom"
-               name="Custom"
-               value="[i-1,i-1]" />
             </combo_box>
             <text
              follows="left|top"
@@ -147,7 +143,7 @@
              top="12"
              type="string"
              width="50">
-              1,031 KB
+              [SIZE] KB
             </text>
             <ui_ctrl
                 height="150"
-- 
cgit v1.2.3


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/skins/default/xui/en/floater_social.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

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


From 4a8579462c464bd73d79256435d08ebc4112ccf7 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 25 Jun 2013 19:49:13 +0100
Subject: made status update post button disabled for ACME-571

---
 indra/newview/skins/default/xui/en/floater_social.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 1ae8f7ed65..3b19a2f4cb 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -49,7 +49,7 @@
         left="9"
         length="1"
         max_length="700"
-        name="message"
+        name="status_message"
         type="string"
         word_wrap="true">
       </text_editor>
@@ -57,7 +57,7 @@
         follows="left|top"
         height="23"
         label="Post"
-        name="post_btn"
+        name="post_status_btn"
         top_pad="18"
         width="100">
         <button.commit_callback
-- 
cgit v1.2.3


From ec09ce526b477869aa76dddaa8e11eecca57989d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 25 Jun 2013 15:49:39 -0700
Subject: ACME-612 : Implemented a loading indicator for the map tile when it's
 loading, also disable the checkbox during that time

---
 .../skins/default/xui/en/floater_social.xml        | 27 ++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 76c15b9624..960f883595 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -379,16 +379,25 @@
           <layout_panel
             name="place_map_panel"
             height="133">
-            <icon
+              <loading_indicator
               follows="left|top"
-              height="128"
-              width="128"
-              image_name="Map_Placeholder_Icon"
-              layout="topleft"
-              top="5"
-              left="9"
-              name="map_placeholder">
-            </icon>
+              height="24"
+              width="24"
+              name="map_loading_indicator"
+              top="57"
+              left="61"
+              visible="true"/>
+              <icon
+                follows="left|top"
+                height="128"
+                width="128"
+                image_name="Map_Placeholder_Icon"
+                layout="topleft"
+                top="5"
+                left="9"
+                visible="false"
+                name="map_placeholder">
+              </icon>
             <check_box
               follows="left|top"
               initial_value="true"
-- 
cgit v1.2.3


From 0b34d1c34cccd1ed95f17293ef941289b40e39f9 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 27 Jun 2013 16:47:00 -0700
Subject: ACME-630 Adjust floater_social.xml to load panels from files instead
 of in-lining

---
 .../skins/default/xui/en/floater_social.xml        | 412 +--------------------
 1 file changed, 9 insertions(+), 403 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 960f883595..27c01eec4d 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -23,428 +23,34 @@
    height="430"
    halign="center">
     <panel
+     filename="panel_social_status.xml"
      class="llsocialstatuspanel"
      background_opaque="true"
      background_visible="true"
      bg_alpha_color="DkGray"
      bg_opaque_color="DkGray"
      label="STATUS"
-     help_topic="social_status_tab"
-     name="status_panel">
-      <text
-        length="1"
-        follows="top|left|right"
-        font="SansSerif"
-        height="16"
-        left="9"
-        name="caption_label"
-        top_pad="18"
-        type="string">
-        What's on your mind?
-      </text>
-      <text_editor
-        follows="left|top"
-        height="80"
-        width="280"
-        left="9"
-        length="1"
-        max_length="700"
-        name="status_message"
-        type="string"
-        word_wrap="true">
-      </text_editor>
-      <button
-        follows="left|top"
-        height="23"
-        label="Post"
-        name="post_status_btn"
-        top_pad="18"
-        width="100">
-        <button.commit_callback
-          function="SocialSharing.SendStatus" />
-      </button>
-      <button
-        follows="left|top"
-        height="23"
-        label="Cancel"
-        name="cancel_btn"
-        left_pad="15"
-        top_delta="0"
-        width="100">
-        <button.commit_callback
-          function="SocialSharing.Cancel" />
-      </button>
-    </panel>
+     help_topic="panel_social_status"
+     name="panel_social_status"/>
     <panel
+      filename="panel_social_photo.xml"
       class="llsocialphotopanel"
       follows="all"
-      height="430"
       background_visible="true"
       bg_alpha_color="DkGray"
       bg_opaque_color="DkGray"
       label="PHOTO"
-      help_topic="social_photo_tab"
-      name="social_photo_tab">
-      <layout_stack
-       border_size="0"
-       height="422"
-       follows="all"
-       orientation="vertical"
-       name="stack1"
-       top="8">
-        <layout_panel
-         name="photo_detail_panel"
-         height="295">
-          <panel
-            top="0"
-            follows="all"
-            height="295"
-            width="286"
-            left="7"
-            background_opaque="true"
-            background_visible="true"
-            bg_opaque_color="DkGray2"
-            label="snapshot_panel"
-            help_topic="snapshot_panel"
-            name="snapshot_panel">
-            <combo_box
-             control_name="SocialPhotoResolution"
-             follows="left|top"
-             top="6"
-             left="9"
-             name="resolution_combobox"
-             tool_tip="Image resolution"
-             height="21"
-             width="135">
-              <combo_box.item
-               label="Current Window"
-               name="CurrentWindow"
-               value="[i0,i0]" />
-              <combo_box.item
-               label="640x480"
-               name="640x480"
-               value="[i640,i480]" />
-              <combo_box.item
-               label="800x600"
-               name="800x600"
-               value="[i800,i600]" />
-              <combo_box.item
-               label="1024x768"
-               name="1024x768"
-               value="[i1024,i768]" />
-            </combo_box>
-            <text
-             follows="left|top"
-             font="SansSerifSmall"
-             height="14"
-             left="208"
-             length="1"
-             halign="right"
-             name="file_size_label"
-             top="12"
-             type="string"
-             width="50">
-              [SIZE] KB
-            </text>
-            <ui_ctrl
-                height="150"
-                width="250"
-                name="thumbnail_placeholder"
-                top_pad="5"
-                follows="left|top"
-                left="9">
-              <panel
-               background_visible="true"
-               bg_alpha_color="0.9 1 0.9 1"
-               follows="left|top"
-               font="SansSerifLarge"
-               halign="center"
-               height="20"
-               left="0"
-               length="1"
-               name="succeeded_panel"
-               right="-1"
-               top="0"
-               type="string"
-               visible="false">
-                <text
-                 follows="all"
-                 font="SansSerif"
-                 halign="center"
-                 height="18"
-                 left="1"
-                 length="1"
-                 name="succeeded_lbl"
-                 right="-1"
-                 text_color="0.2 0.5 0.2 1"
-                 top="4"
-                 translate="false"
-                 type="string">
-                  Succeeded
-                </text>
-              </panel>
-              <panel
-               background_visible="true"
-               bg_alpha_color="1 0.9 0.9 1"
-               follows="left|top"
-               font="SansSerifLarge"
-               halign="center"
-               height="20"
-               left_delta="0"
-               length="1"
-               name="failed_panel"
-               right="-1"
-               top="0"
-               type="string"
-               visible="false">
-                <text
-                 follows="all"
-                 font="SansSerif"
-                 halign="center"
-                 height="18"
-                 left="1"
-                 length="1"
-                 name="failed_lbl"
-                 right="-1"
-                 text_color="0.5 0.2 0.2 1"
-                 top="4"
-                 translate="false"
-                 type="string">
-                  Failed
-                </text>
-              </panel>
-              <loading_indicator
-               follows="left|top"
-               height="48"
-               name="working_indicator"
-               left="101"
-               top="46"
-               visible="false"
-               width="48" />
-              <text
-               follows="left|top|right"
-               font="SansSerifBold"
-               height="14"
-               left="5"
-               length="1"
-               halign="center"
-               name="working_lbl"
-               right="-5"
-               top="98"
-               translate="false"
-               type="string"
-               visible="false"
-               width="130">
-                Working
-              </text>
-              <button
-               follows="left|top"
-               height="22"
-               image_overlay="Refresh_Off"
-               left="20"
-               name="new_snapshot_btn"
-               bottom="-20"
-               visible="false"
-               width="22" />
-              <text
-               follows="left|top"
-               font="SansSerifBold"
-               halign="left"
-               height="18"
-               left_pad="10"
-               length="1"
-               name="refresh_lbl"
-               right="-5"
-               text_color="red"
-               top_delta="0"
-               translate="false"
-               type="string"
-               visible="false"
-               width="130">
-                Refresh to save.
-              </text>
-            </ui_ctrl>
-            <text
-             length="1"
-             follows="top|left|right"
-             font="SansSerif"
-             height="16"
-             left="9"
-             name="caption_label"
-             top_pad="12"
-             type="string">
-              Comment (optional):
-            </text>
-            <text_editor
-             follows="left|top"
-             height="47"
-             width="250"
-             left="9"
-             length="1"
-             max_length="700"
-             name="caption"
-             type="string"
-             word_wrap="true">
-            </text_editor>
-            <check_box
-             follows="left|top"
-             initial_value="true"
-             label="Include location in posting"
-             name="add_location_cb"
-             top_pad="19"/>            
-            </panel>
-        </layout_panel>
-        <layout_panel
-          name="photo_button_panel"
-          height="96">
-          <panel
-            height="96"
-            top="0"
-            follows="all"
-            left="7"
-            right="-10"
-            background_opaque="true"
-            background_visible="true"
-            bg_opaque_color="DkGray"
-            label="button_container"
-            help_topic="button_container"
-            name="button_container"/>
-          <button
-           follows="left|top"
-           top="15"
-           height="23"
-           label="Post"
-           name="post_btn"
-           width="100">
-            <button.commit_callback
-             function="PostToFacebook.Send" />
-          </button>
-          <button
-               follows="left|top"
-               height="23"
-               label="Cancel"
-               name="cancel_btn"
-               left_pad="15"
-               top_delta="0"
-               width="100">
-            <button.commit_callback
-             function="SocialSharing.Cancel" />
-          </button>          
-        </layout_panel>        
-      </layout_stack>
-    </panel>
+      help_topic="panel_social_photo"
+      name="panel_social_photo"/>
     <panel
+      filename="panel_social_place.xml"
       class="llsocialcheckinpanel"
       follows="all"
-      height="430"
       background_visible="true"
       bg_alpha_color="DkGray"
       bg_opaque_color="DkGray"
       label="PLACE"
-      help_topic="social_place_tab"
-      name="place_panel">
-      <layout_stack
-        border_size="0"
-        height="422"
-        follows="all"
-        orientation="vertical"
-        name="stack_place"
-        top="8">
-        <layout_panel
-          name="place_detail_panel"
-          height="122">
-          <text
-            length="1"
-            follows="top|left|right"
-            font="SansSerif"
-            height="16"
-            left="9"
-            name="place_caption_label"
-            top_pad="12"
-            type="string">
-            Say something about where you are:
-          </text>
-          <text_editor
-            follows="top|left|right"
-            height="94"
-            right="-9"
-            left="9"
-            length="1"
-            max_length="700"
-            name="place_caption"
-            type="string"
-            word_wrap="true">
-           </text_editor>
-          </layout_panel>
-          <layout_panel
-            name="place_map_panel"
-            height="133">
-              <loading_indicator
-              follows="left|top"
-              height="24"
-              width="24"
-              name="map_loading_indicator"
-              top="57"
-              left="61"
-              visible="true"/>
-              <icon
-                follows="left|top"
-                height="128"
-                width="128"
-                image_name="Map_Placeholder_Icon"
-                layout="topleft"
-                top="5"
-                left="9"
-                visible="false"
-                name="map_placeholder">
-              </icon>
-            <check_box
-              follows="left|top"
-              initial_value="true"
-              top_delta="8"
-              width="8"
-              label=""
-              name="add_place_view_cb"
-              left_pad="5"/>
-            <text
-              follows="left|top"
-              font="SansSerif"
-              height="32"
-              width="130"
-              word_wrap="true"
-              left_pad="12"
-              top_delta="-8"
-              type="string">
-              Include overhead view of location
-            </text>
-          </layout_panel>
-          <layout_panel
-            name="place_button_panel"
-            height="96">
-            <button
-              follows="left|top"
-              top="5"
-              left="9"
-              height="23"
-              label="Post"
-              name="post_place_btn"
-              width="100">
-              <button.commit_callback
-                 function="SocialSharing.SendCheckin" />
-            </button>
-            <button
-              follows="left|top"
-              height="23"
-              label="Cancel"
-              name="cancel_btn"
-              left_pad="15"
-              top_delta="0"
-              width="100">
-              <button.commit_callback
-                  function="SocialSharing.Cancel" />
-            </button>
-        </layout_panel>
-     </layout_stack>
-    </panel>
+      help_topic="panel_social_place"
+      name="panel_social_place"/>
   </tab_container>
 </floater>
-- 
cgit v1.2.3


From 00ef5e101c64bdcb85698e574d8f730e139fedeb Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 2 Jul 2013 13:27:23 -0700
Subject: ACME-626 : Add xml widgets for the connection status in the Facebook
 panel

---
 .../skins/default/xui/en/floater_social.xml        | 29 +++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 27c01eec4d..c571497769 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -20,7 +20,7 @@
    tab_height="30"
    tab_position="top"
    top="7"
-   height="430"
+   height="395"
    halign="center">
     <panel
      filename="panel_social_status.xml"
@@ -53,4 +53,31 @@
       help_topic="panel_social_place"
       name="panel_social_place"/>
   </tab_container>
+  <panel
+   name="connection_status_panel"
+   follows="left|top"
+   height="26">
+   <loading_indicator
+     follows="left|top"
+     height="24"
+     width="24"
+     name="connection_loading_indicator"
+     top="0"
+     left="9"
+     visible="true"/>
+   <text
+     name="connection_status_text"
+     type="string"
+     follows="left|top"
+     top="3"
+     left_pad="5"
+     width="250"
+     height="20"
+     wrap="true"
+     halign="left"
+     valign="center"
+     font="SansSerif">
+      Test text
+   </text>
+  </panel>
 </floater>
-- 
cgit v1.2.3


From 8c4a39b2025ef64f6218dc112e37f71c65aac446 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 2 Jul 2013 18:34:17 -0700
Subject: ACME-626 : Implement status and progress update text

---
 indra/newview/skins/default/xui/en/floater_social.xml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index c571497769..61210135ee 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -57,6 +57,21 @@
    name="connection_status_panel"
    follows="left|top"
    height="26">
+   <text
+     name="connection_error_text"
+     type="string"
+     follows="left|top"
+     top="3"
+     left="12"
+     width="250"
+     height="20"
+     wrap="true"
+     halign="left"
+     valign="center"
+     text_color="Yellow"
+     font="SansSerif">
+     Problem Connecting to Facebook 
+   </text>
    <loading_indicator
      follows="left|top"
      height="24"
@@ -66,7 +81,7 @@
      left="9"
      visible="true"/>
    <text
-     name="connection_status_text"
+     name="connection_loading_text"
      type="string"
      follows="left|top"
      top="3"
@@ -77,7 +92,7 @@
      halign="left"
      valign="center"
      font="SansSerif">
-      Test text
+      Connecting to Facebook...
    </text>
   </panel>
 </floater>
-- 
cgit v1.2.3


From e7cb0fe13be7f1b37d24cea5e8ea070cdcf7b5a6 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 3 Jul 2013 14:48:22 -0700
Subject: ACME-626 : Unify the xml of status and place so things line up.
 Simplify the xml of photo

---
 indra/newview/skins/default/xui/en/floater_social.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 61210135ee..3ce6841a3a 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -25,7 +25,7 @@
     <panel
      filename="panel_social_status.xml"
      class="llsocialstatuspanel"
-     background_opaque="true"
+     follows="all"
      background_visible="true"
      bg_alpha_color="DkGray"
      bg_opaque_color="DkGray"
-- 
cgit v1.2.3


From 6e8b353575f670e50267cb172860a3f8da1dbbd0 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 3 Jul 2013 19:29:42 -0700
Subject: ACME-626 : Simplify the preview drawing code and positioning

---
 indra/newview/skins/default/xui/en/floater_social.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 3ce6841a3a..40800c87e6 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -36,9 +36,6 @@
       filename="panel_social_photo.xml"
       class="llsocialphotopanel"
       follows="all"
-      background_visible="true"
-      bg_alpha_color="DkGray"
-      bg_opaque_color="DkGray"
       label="PHOTO"
       help_topic="panel_social_photo"
       name="panel_social_photo"/>
-- 
cgit v1.2.3


From aa19308473c5733138eb378863e0944659d56689 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Mon, 8 Jul 2013 22:46:00 +0100
Subject: got rid of gray background on social floater

---
 indra/newview/skins/default/xui/en/floater_social.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 40800c87e6..cd5609b0f8 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -20,7 +20,7 @@
    tab_height="30"
    tab_position="top"
    top="7"
-   height="395"
+   height="430"
    halign="center">
     <panel
      filename="panel_social_status.xml"
@@ -36,6 +36,9 @@
       filename="panel_social_photo.xml"
       class="llsocialphotopanel"
       follows="all"
+      background_visible="true"
+      bg_alpha_color="DkGray"
+      bg_opaque_color="DkGray"
       label="PHOTO"
       help_topic="panel_social_photo"
       name="panel_social_photo"/>
@@ -53,7 +56,8 @@
   <panel
    name="connection_status_panel"
    follows="left|top"
-   height="26">
+   height="26"
+   top_pad="-30">
    <text
      name="connection_error_text"
      type="string"
-- 
cgit v1.2.3


From 0be0b0e8b01338564b1502b8bb2b40e5a9454b0f Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 8 Jul 2013 16:01:20 -0700
Subject: ACME-651 : Implement all missing status messages, tweak colors and
 positioning

---
 .../skins/default/xui/en/floater_social.xml        | 37 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 40800c87e6..52840c5435 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -65,9 +65,24 @@
      wrap="true"
      halign="left"
      valign="center"
-     text_color="Yellow"
+     text_color="DrYellow"
      font="SansSerif">
-     Problem Connecting to Facebook 
+     Problem connecting to Facebook
+   </text>
+   <text
+     name="connection_error_posting_text"
+     type="string"
+     follows="left|top"
+     top="3"
+     left="12"
+     width="250"
+     height="20"
+     wrap="true"
+     halign="left"
+     valign="center"
+     text_color="DrYellow"
+     font="SansSerif">
+     Problem posting to Facebook
    </text>
    <loading_indicator
      follows="left|top"
@@ -88,8 +103,24 @@
      wrap="true"
      halign="left"
      valign="center"
+     text_color="EmphasisColor"
+     font="SansSerif">
+     Connecting to Facebook...
+   </text>
+   <text
+     name="connection_posting_text"
+     type="string"
+     follows="left|top"
+     top="3"
+     left="38"
+     width="250"
+     height="20"
+     wrap="true"
+     halign="left"
+     valign="center"
+     text_color="EmphasisColor"
      font="SansSerif">
-      Connecting to Facebook...
+     Posting...
    </text>
   </panel>
 </floater>
-- 
cgit v1.2.3


From e6ac587f372559c4c84f8b1e4bc5ab94d9a665c3 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 8 Jul 2013 17:12:31 -0700
Subject: ACME-651 : Use localizable strings and simplify the xml for status
 and error fields

---
 .../skins/default/xui/en/floater_social.xml        | 34 ++--------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 52840c5435..781c48729c 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -67,22 +67,7 @@
      valign="center"
      text_color="DrYellow"
      font="SansSerif">
-     Problem connecting to Facebook
-   </text>
-   <text
-     name="connection_error_posting_text"
-     type="string"
-     follows="left|top"
-     top="3"
-     left="12"
-     width="250"
-     height="20"
-     wrap="true"
-     halign="left"
-     valign="center"
-     text_color="DrYellow"
-     font="SansSerif">
-     Problem posting to Facebook
+     Error
    </text>
    <loading_indicator
      follows="left|top"
@@ -105,22 +90,7 @@
      valign="center"
      text_color="EmphasisColor"
      font="SansSerif">
-     Connecting to Facebook...
-   </text>
-   <text
-     name="connection_posting_text"
-     type="string"
-     follows="left|top"
-     top="3"
-     left="38"
-     width="250"
-     height="20"
-     wrap="true"
-     halign="left"
-     valign="center"
-     text_color="EmphasisColor"
-     font="SansSerif">
-     Posting...
+     Loading...
    </text>
   </panel>
 </floater>
-- 
cgit v1.2.3


From d869e706b8e664ff74e9ee9da4a43490d464a8b7 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 8 Jul 2013 17:42:44 -0700
Subject: Revert some of Cho's changes in xml as it breaks the preview in the
 Photo panel

---
 indra/newview/skins/default/xui/en/floater_social.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 0a7014c876..2d6f8a9a73 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -20,7 +20,7 @@
    tab_height="30"
    tab_position="top"
    top="7"
-   height="430"
+   height="395"
    halign="center">
     <panel
      filename="panel_social_status.xml"
@@ -36,9 +36,6 @@
       filename="panel_social_photo.xml"
       class="llsocialphotopanel"
       follows="all"
-      background_visible="true"
-      bg_alpha_color="DkGray"
-      bg_opaque_color="DkGray"
       label="PHOTO"
       help_topic="panel_social_photo"
       name="panel_social_photo"/>
-- 
cgit v1.2.3


From 073a7f5096d271f51885601d01bb1494daa6ff4a Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 9 Jul 2013 16:59:10 -0700
Subject: Layout tweaks of the social floater

---
 indra/newview/skins/default/xui/en/floater_social.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 2d6f8a9a73..fe89e8ed5b 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -11,7 +11,7 @@
   single_instance="true"
   reuse_instance="true"
   title="FACEBOOK"
-  height="437"
+  height="450"
   width="304">
   <tab_container
    name="tabs"
@@ -19,16 +19,16 @@
    tab_min_width="70"
    tab_height="30"
    tab_position="top"
+   background_visible="true"
+   bg_alpha_color="DkGray"
+   bg_opaque_color="DkGray"
    top="7"
-   height="395"
+   height="430"
    halign="center">
     <panel
      filename="panel_social_status.xml"
      class="llsocialstatuspanel"
      follows="all"
-     background_visible="true"
-     bg_alpha_color="DkGray"
-     bg_opaque_color="DkGray"
      label="STATUS"
      help_topic="panel_social_status"
      name="panel_social_status"/>
@@ -43,9 +43,6 @@
       filename="panel_social_place.xml"
       class="llsocialcheckinpanel"
       follows="all"
-      background_visible="true"
-      bg_alpha_color="DkGray"
-      bg_opaque_color="DkGray"
       label="PLACE"
       help_topic="panel_social_place"
       name="panel_social_place"/>
@@ -53,8 +50,10 @@
   <panel
    name="connection_status_panel"
    follows="left|top"
-   height="26"
-   top_pad="-30">
+   background_visible="true"
+   bg_alpha_color="DkGray"
+   bg_opaque_color="DkGray"
+   height="24">
    <text
      name="connection_error_text"
      type="string"
-- 
cgit v1.2.3


From 655606220351e4ee98adbd2a7768388234f6350c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 9 Jul 2013 20:59:05 -0700
Subject: Fix background color in floater social

---
 .../skins/default/xui/en/floater_social.xml        | 166 +++++++++++----------
 1 file changed, 89 insertions(+), 77 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index fe89e8ed5b..c24e9a2194 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -11,86 +11,98 @@
   single_instance="true"
   reuse_instance="true"
   title="FACEBOOK"
-  height="450"
+  height="465"
   width="304">
-  <tab_container
-   name="tabs"
-   tab_group="1"
-   tab_min_width="70"
-   tab_height="30"
-   tab_position="top"
-   background_visible="true"
-   bg_alpha_color="DkGray"
-   bg_opaque_color="DkGray"
-   top="7"
-   height="430"
-   halign="center">
-    <panel
-     filename="panel_social_status.xml"
-     class="llsocialstatuspanel"
-     follows="all"
-     label="STATUS"
-     help_topic="panel_social_status"
-     name="panel_social_status"/>
-    <panel
-      filename="panel_social_photo.xml"
-      class="llsocialphotopanel"
-      follows="all"
-      label="PHOTO"
-      help_topic="panel_social_photo"
-      name="panel_social_photo"/>
-    <panel
-      filename="panel_social_place.xml"
-      class="llsocialcheckinpanel"
-      follows="all"
-      label="PLACE"
-      help_topic="panel_social_place"
-      name="panel_social_place"/>
-  </tab_container>
   <panel
-   name="connection_status_panel"
-   follows="left|top"
+   height="465"
+   width="304"
+   visible="true"
+   name="background"
    background_visible="true"
-   bg_alpha_color="DkGray"
    bg_opaque_color="DkGray"
-   height="24">
-   <text
-     name="connection_error_text"
-     type="string"
-     follows="left|top"
-     top="3"
-     left="12"
-     width="250"
-     height="20"
-     wrap="true"
-     halign="left"
-     valign="center"
-     text_color="DrYellow"
-     font="SansSerif">
-     Error
-   </text>
-   <loading_indicator
-     follows="left|top"
-     height="24"
-     width="24"
-     name="connection_loading_indicator"
-     top="0"
-     left="9"
-     visible="true"/>
-   <text
-     name="connection_loading_text"
-     type="string"
-     follows="left|top"
-     top="3"
-     left_pad="5"
-     width="250"
-     height="20"
-     wrap="true"
-     halign="left"
-     valign="center"
-     text_color="EmphasisColor"
-     font="SansSerif">
-     Loading...
-   </text>
+   bg_alpha_color="DkGray_66"
+   follows="all"
+   top="0"
+   left="0">
+   <tab_container
+     name="tabs"
+     tab_group="1"
+     tab_min_width="70"
+     tab_height="30"
+     tab_position="top"
+     background_visible="true"
+     bg_opaque_color="DkGray"
+     bg_alpha_color="DkGray_66"
+     top="7"
+     height="430"
+     halign="center">
+     <panel
+       filename="panel_social_status.xml"
+       class="llsocialstatuspanel"
+       follows="all"
+       label="STATUS"
+       help_topic="panel_social_status"
+       name="panel_social_status"/>
+     <panel
+       filename="panel_social_photo.xml"
+       class="llsocialphotopanel"
+       follows="all"
+       label="PHOTO"
+       help_topic="panel_social_photo"
+       name="panel_social_photo"/>
+     <panel
+       filename="panel_social_place.xml"
+       class="llsocialcheckinpanel"
+       follows="all"
+       label="PLACE"
+       help_topic="panel_social_place"
+       name="panel_social_place"/>
+    </tab_container>
+    <panel
+     name="connection_status_panel"
+     follows="left|bottom|right"
+     background_visible="true"
+     bg_opaque_color="DkGray"
+     bg_alpha_color="DkGray_66"
+     height="24">
+     <text
+      name="connection_error_text"
+      type="string"
+      follows="left|bottom|right"
+      top="3"
+      left="12"
+      width="250"
+      height="20"
+      wrap="true"
+      halign="left"
+      valign="center"
+      text_color="DrYellow"
+      font="SansSerif">
+      Error
+     </text>
+     <loading_indicator
+      follows="left|bottom|right"
+      height="24"
+      width="24"
+      name="connection_loading_indicator"
+      top="0"
+      left="9"
+      visible="true"/>
+     <text
+      name="connection_loading_text"
+      type="string"
+      follows="left|bottom|right"
+      top="3"
+      left_pad="5"
+      width="250"
+      height="20"
+      wrap="true"
+      halign="left"
+      valign="center"
+      text_color="EmphasisColor"
+      font="SansSerif">
+      Loading...
+    </text>
   </panel>
+ </panel>
 </floater>
-- 
cgit v1.2.3


From 0530eac42c8cbb4f41131e8d7796006b47ba1fa5 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 12 Jul 2013 17:57:31 -0700
Subject: ACME-701 : Align all social panels UX, recenter the preview in the
 photo panel

---
 indra/newview/skins/default/xui/en/floater_social.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index c24e9a2194..65f738de1f 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -11,10 +11,10 @@
   single_instance="true"
   reuse_instance="true"
   title="FACEBOOK"
-  height="465"
+  height="482"
   width="304">
   <panel
-   height="465"
+   height="482"
    width="304"
    visible="true"
    name="background"
@@ -34,7 +34,7 @@
      bg_opaque_color="DkGray"
      bg_alpha_color="DkGray_66"
      top="7"
-     height="430"
+     height="437"
      halign="center">
      <panel
        filename="panel_social_status.xml"
@@ -69,8 +69,8 @@
       name="connection_error_text"
       type="string"
       follows="left|bottom|right"
-      top="3"
-      left="12"
+      top="5"
+      left="9"
       width="250"
       height="20"
       wrap="true"
@@ -85,14 +85,14 @@
       height="24"
       width="24"
       name="connection_loading_indicator"
-      top="0"
+      top="2"
       left="9"
       visible="true"/>
      <text
       name="connection_loading_text"
       type="string"
       follows="left|bottom|right"
-      top="3"
+      top="5"
       left_pad="5"
       width="250"
       height="20"
-- 
cgit v1.2.3


From 61e5164a41faf5d56919377ea00a6166b772a5a1 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 15 Jul 2013 16:06:34 -0700
Subject: ACME-680 Create the Account tab

---
 indra/newview/skins/default/xui/en/floater_social.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 65f738de1f..7f52a8c0da 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -57,6 +57,12 @@
        label="PLACE"
        help_topic="panel_social_place"
        name="panel_social_place"/>
+     <panel
+       filename="panel_social_account.xml"
+       follows="all"
+       label="ACCOUNT"
+       help_topic="panel_social_account"
+       name="panel_social_account"/>     
     </tab_container>
     <panel
      name="connection_status_panel"
-- 
cgit v1.2.3


From 095c53fa060b3d336b408e8b87f30518c8db36cd Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Wed, 17 Jul 2013 17:50:54 -0700
Subject: ACME-731 Create the llsocialaccountpanel class to handle
 input/feedback.

---
 indra/newview/skins/default/xui/en/floater_social.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 7f52a8c0da..eb209eb314 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -59,6 +59,7 @@
        name="panel_social_place"/>
      <panel
        filename="panel_social_account.xml"
+       class="llsocialaccountpanel"
        follows="all"
        label="ACCOUNT"
        help_topic="panel_social_account"
-- 
cgit v1.2.3


From 66d41f02ba0e55a2cb34752c8f77b71b9a0c0503 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 23 Jul 2013 16:30:24 -0700
Subject: changing facebook floater title to match spec. The title was
 'FACEBOOK' and is now 'POST TO FACEOOK'

---
 indra/newview/skins/default/xui/en/floater_social.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index eb209eb314..3eff2c2ae1 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -10,7 +10,7 @@
   save_rect="true"
   single_instance="true"
   reuse_instance="true"
-  title="FACEBOOK"
+  title="POST TO FACEBOOK"
   height="482"
   width="304">
   <panel
-- 
cgit v1.2.3


From 93e8ec86dc08ace8bf9a20a0d14b38d47f961c47 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 2 Aug 2013 19:21:38 +0100
Subject: changed PLACE to CHECK IN for ACME-794

---
 indra/newview/skins/default/xui/en/floater_social.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 3eff2c2ae1..39df777d1b 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -54,7 +54,7 @@
        filename="panel_social_place.xml"
        class="llsocialcheckinpanel"
        follows="all"
-       label="PLACE"
+       label="CHECK IN"
        help_topic="panel_social_place"
        name="panel_social_place"/>
      <panel
-- 
cgit v1.2.3


From eaf287cc20efbad97fba17a65efd57eeba0f7278 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 9 Sep 2013 13:36:34 -0700
Subject: ACME-906 : Clean up xml from overzealous background color and opacity
 settings

---
 indra/newview/skins/default/xui/en/floater_social.xml | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 39df777d1b..426c5507e4 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-
 <floater
   positioning="cascading"
   can_close="true"
@@ -18,9 +17,6 @@
    width="304"
    visible="true"
    name="background"
-   background_visible="true"
-   bg_opaque_color="DkGray"
-   bg_alpha_color="DkGray_66"
    follows="all"
    top="0"
    left="0">
@@ -30,9 +26,6 @@
      tab_min_width="70"
      tab_height="30"
      tab_position="top"
-     background_visible="true"
-     bg_opaque_color="DkGray"
-     bg_alpha_color="DkGray_66"
      top="7"
      height="437"
      halign="center">
@@ -68,9 +61,6 @@
     <panel
      name="connection_status_panel"
      follows="left|bottom|right"
-     background_visible="true"
-     bg_opaque_color="DkGray"
-     bg_alpha_color="DkGray_66"
      height="24">
      <text
       name="connection_error_text"
-- 
cgit v1.2.3


From f53b2bd880875b5194b6d298e1aad7d8951db9f3 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 20 Sep 2013 14:11:07 -0700
Subject: ACME-902: Link the '?' button to the proper viewer-help article or
 articles

---
 indra/newview/skins/default/xui/en/floater_social.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_social.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 426c5507e4..b7ff374d5f 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -3,7 +3,7 @@
   positioning="cascading"
   can_close="true"
   can_resize="false"
-  help_topic="social floater"
+  help_topic="floater_social"
   layout="topleft"
   name="floater_social"
   save_rect="true"
@@ -34,28 +34,24 @@
        class="llsocialstatuspanel"
        follows="all"
        label="STATUS"
-       help_topic="panel_social_status"
        name="panel_social_status"/>
      <panel
        filename="panel_social_photo.xml"
        class="llsocialphotopanel"
        follows="all"
        label="PHOTO"
-       help_topic="panel_social_photo"
        name="panel_social_photo"/>
      <panel
        filename="panel_social_place.xml"
        class="llsocialcheckinpanel"
        follows="all"
        label="CHECK IN"
-       help_topic="panel_social_place"
        name="panel_social_place"/>
      <panel
        filename="panel_social_account.xml"
        class="llsocialaccountpanel"
        follows="all"
        label="ACCOUNT"
-       help_topic="panel_social_account"
        name="panel_social_account"/>     
     </tab_container>
     <panel
-- 
cgit v1.2.3