From fc05dc5114785368e37e325fdb429fed7cd3c363 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 27 Jun 2013 16:52:53 -0700
Subject: ACME-630 Adding missing files

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml
new file mode 100644
index 0000000000..ae199e7e38
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_social_status.xml
@@ -0,0 +1,50 @@
+    <panel
+	 height="430"
+	 width="304"
+     name="panel_social_status">
+      <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
+	    layout="topleft"
+        follows="left|top"
+        height="23"
+        label="Post"
+        name="post_status_btn"
+        top_pad="18"
+        width="100">
+        <button.commit_callback
+          function="SocialSharing.SendStatus" />
+      </button>
+      <button
+	    layout="topleft"
+        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>
\ No newline at end of file
-- 
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

---
 .../skins/default/xui/en/panel_social_status.xml   | 49 +++++++++++++++-------
 1 file changed, 33 insertions(+), 16 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml
index ae199e7e38..f817a515e7 100644
--- a/indra/newview/skins/default/xui/en/panel_social_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_status.xml
@@ -1,42 +1,57 @@
     <panel
-	 height="430"
+	 height="395"
 	 width="304"
+	 layout="topleft"
      name="panel_social_status">
-      <text
+     <layout_stack
+      layout="topleft"
+      border_size="0"
+      height="395"
+      follows="all"
+      orientation="vertical"
+      name="stack_status"
+      top="8">
+      <layout_panel
+       name="status_detail_panel"
+       height="255">
+       <text
         length="1"
         follows="top|left|right"
         font="SansSerif"
         height="16"
         left="9"
-        name="caption_label"
-        top_pad="18"
+        name="status_caption_label"
+        top="1"
         type="string">
         What's on your mind?
-      </text>
-      <text_editor
-        follows="left|top"
+       </text>
+       <text_editor
+        follows="left|top|right"
         height="80"
-        width="280"
+        right="-9"
         left="9"
         length="1"
         max_length="700"
         name="status_message"
         type="string"
         word_wrap="true">
-      </text_editor>
-      <button
-	    layout="topleft"
+       </text_editor>
+      </layout_panel>
+      <layout_panel
+       name="status_button_panel"
+       height="96">
+       <button
         follows="left|top"
+        top="5"
+        left="9"
         height="23"
         label="Post"
         name="post_status_btn"
-        top_pad="18"
         width="100">
         <button.commit_callback
           function="SocialSharing.SendStatus" />
-      </button>
-      <button
-	    layout="topleft"
+       </button>
+       <button
         follows="left|top"
         height="23"
         label="Cancel"
@@ -46,5 +61,7 @@
         width="100">
         <button.commit_callback
           function="SocialSharing.Cancel" />
-      </button>
+       </button>
+      </layout_panel>
+     </layout_stack>
     </panel>
\ No newline at end of file
-- 
cgit v1.2.3


From b9a94613875d05dfd8e2971059e343720294d6d6 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Mon, 8 Jul 2013 19:00:19 +0100
Subject: adjusted layout of social status panel

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml
index f817a515e7..c9bdf3b645 100644
--- a/indra/newview/skins/default/xui/en/panel_social_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_status.xml
@@ -13,7 +13,7 @@
       top="8">
       <layout_panel
        name="status_detail_panel"
-       height="255">
+       height="40">
        <text
         length="1"
         follows="top|left|right"
@@ -64,4 +64,4 @@
        </button>
       </layout_panel>
      </layout_stack>
-    </panel>
\ No newline at end of file
+    </panel>
-- 
cgit v1.2.3


From 13d165290d62a6bd2d9a1b09c952458e64bbb710 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 9 Jul 2013 00:28:39 +0100
Subject: moved buttons to bottom of social floater above status text

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml
index c9bdf3b645..c5059b679b 100644
--- a/indra/newview/skins/default/xui/en/panel_social_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_status.xml
@@ -42,7 +42,7 @@
        height="96">
        <button
         follows="left|top"
-        top="5"
+        top="213"
         left="9"
         height="23"
         label="Post"
-- 
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/panel_social_status.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml
index c5059b679b..b6f3f00cd4 100644
--- a/indra/newview/skins/default/xui/en/panel_social_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_status.xml
@@ -1,19 +1,19 @@
     <panel
-	 height="395"
+	 height="393"
 	 width="304"
 	 layout="topleft"
      name="panel_social_status">
      <layout_stack
       layout="topleft"
       border_size="0"
-      height="395"
+      height="385"
       follows="all"
       orientation="vertical"
       name="stack_status"
       top="8">
       <layout_panel
        name="status_detail_panel"
-       height="40">
+       height="360">
        <text
         length="1"
         follows="top|left|right"
@@ -39,10 +39,10 @@
       </layout_panel>
       <layout_panel
        name="status_button_panel"
-       height="96">
+       height="25">
        <button
         follows="left|top"
-        top="213"
+        top="0"
         left="9"
         height="23"
         label="Post"
-- 
cgit v1.2.3


From b22b47fde552d2b1951858b7a4707876744cf396 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 10 Jul 2013 19:26:42 -0700
Subject: ACME-671 : Disable social panel UX while transaction (Post or
 Connection) is ongoing

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml
index b6f3f00cd4..975f8cd29c 100644
--- a/indra/newview/skins/default/xui/en/panel_social_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_status.xml
@@ -55,7 +55,7 @@
         follows="left|top"
         height="23"
         label="Cancel"
-        name="cancel_btn"
+        name="cancel_status_btn"
         left_pad="15"
         top_delta="0"
         width="100">
-- 
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/panel_social_status.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml
index 975f8cd29c..54cfa3f524 100644
--- a/indra/newview/skins/default/xui/en/panel_social_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_status.xml
@@ -1,19 +1,19 @@
     <panel
-	 height="393"
+	 height="400"
 	 width="304"
 	 layout="topleft"
      name="panel_social_status">
      <layout_stack
       layout="topleft"
       border_size="0"
-      height="385"
+      height="392"
       follows="all"
       orientation="vertical"
       name="stack_status"
       top="8">
       <layout_panel
        name="status_detail_panel"
-       height="360">
+       height="367">
        <text
         length="1"
         follows="top|left|right"
@@ -21,14 +21,14 @@
         height="16"
         left="9"
         name="status_caption_label"
-        top="1"
+        top="13"
         type="string">
         What's on your mind?
        </text>
        <text_editor
-        follows="left|top|right"
-        height="80"
-        right="-9"
+        follows="left|top"
+        height="150"
+        width="250"
         left="9"
         length="1"
         max_length="700"
-- 
cgit v1.2.3