From ceec7b7efe8f55f3262e07d9a6284dc5b4ab797a Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 27 Feb 2014 16:03:35 -0800
Subject: ACME-1333 : Allow Facebook panel to be resized, fixed ensuing follow
 positioning issues in all subpanels

---
 indra/newview/skins/default/xui/en/floater_facebook.xml       | 7 +++++--
 indra/newview/skins/default/xui/en/panel_facebook_account.xml | 2 ++
 indra/newview/skins/default/xui/en/panel_facebook_friends.xml | 1 +
 indra/newview/skins/default/xui/en/panel_facebook_photo.xml   | 9 +++++----
 indra/newview/skins/default/xui/en/panel_facebook_place.xml   | 7 ++++---
 indra/newview/skins/default/xui/en/panel_facebook_status.xml  | 7 ++++---
 6 files changed, 21 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_facebook.xml b/indra/newview/skins/default/xui/en/floater_facebook.xml
index 544c443c76..4535b9084e 100644
--- a/indra/newview/skins/default/xui/en/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/en/floater_facebook.xml
@@ -2,7 +2,7 @@
 <floater
   positioning="cascading"
   can_close="true"
-  can_resize="false"
+  can_resize="true"
   help_topic="floater_facebook"
   layout="topleft"
   name="floater_facebook"
@@ -10,6 +10,8 @@
   single_instance="true"
   reuse_instance="true"
   title="POST TO FACEBOOK"
+  min_height="501"
+  min_width="304"
   height="482"
   width="304">
   <panel
@@ -28,6 +30,7 @@
      tab_position="top"
      top="7"
      height="437"
+     follows="all"
      halign="center"
      use_highlighting_on_hover="true">
      <panel
@@ -81,7 +84,7 @@
       Error
      </text>
      <loading_indicator
-      follows="left|bottom|right"
+      follows="left|bottom"
       height="24"
       width="24"
       name="connection_loading_indicator"
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_account.xml b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
index f091d2e9b9..abe0a694a4 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
@@ -2,6 +2,7 @@
 	 height="400"
 	 width="304"
 	 layout="topleft"
+    follows="all"
    name="panel_facebook_account">
   <string
       name="facebook_connected"
@@ -34,6 +35,7 @@
    type="string"/>
   <panel
     layout="topleft"
+    follows="left|top"
     name="panel_buttons"
     height="345"
     left="9">
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
index d772dde0c5..07cbd06afa 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
@@ -2,6 +2,7 @@
 	 height="400"
 	 width="304"
 	 layout="topleft"
+    follows="all"
    name="panel_facebook_friends">
   <accordion
  background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
index 1d826fdbe1..81f7a7de22 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -2,6 +2,7 @@
       height="400"
       width="304"
       layout="topleft"
+      follows="all"
       name="panel_facebook_photo">
       <layout_stack
 	   layout="topleft"
@@ -64,7 +65,7 @@
                 visible="true"
                 name="thumbnail_placeholder"
                 top="33"
-                follows="left|top"
+                follows="left|top|right"
                 left="9">
             </panel>
             <button
@@ -122,7 +123,7 @@
               Comment (optional):
             </text>
             <text_editor
-             follows="left|top"
+             follows="left|top|right"
              height="87"
              width="250"
              left="9"
@@ -145,7 +146,7 @@
           name="photo_button_panel"
           height="25">
           <button
-           follows="left|top"
+           follows="left|bottom"
            top="0"
            left="9"
            height="23"
@@ -156,7 +157,7 @@
              function="SocialSharing.SendPhoto" />
           </button>
           <button
-               follows="left|top"
+               follows="left|bottom"
                height="23"
                label="Cancel"
                name="cancel_photo_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_place.xml b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
index 1eea8f317b..84c87df523 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
@@ -2,6 +2,7 @@
       height="400"
       width="304"
 	  layout="topleft"
+      follows="all"
       name="panel_facebook_place">
       <layout_stack
 	    layout="topleft"
@@ -26,7 +27,7 @@
             Say something about where you are:
           </text>
           <text_editor
-            follows="top|left"
+            follows="top|left|right"
             height="150"
             width="250"
             left="9"
@@ -106,7 +107,7 @@
             name="place_button_panel"
             height="25">
             <button
-              follows="left|top"
+              follows="left|bottom"
               top="0"
               left="9"
               height="23"
@@ -117,7 +118,7 @@
                  function="SocialSharing.SendCheckin" />
             </button>
             <button
-              follows="left|top"
+              follows="left|bottom"
               height="23"
               label="Cancel"
               name="cancel_place_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_status.xml b/indra/newview/skins/default/xui/en/panel_facebook_status.xml
index 50e15c2e80..480abec558 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_status.xml
@@ -1,6 +1,7 @@
     <panel
 	 height="400"
 	 width="304"
+     follows="all"
 	 layout="topleft"
      name="panel_facebook_status">
      <layout_stack
@@ -26,7 +27,7 @@
         What's on your mind?
        </text>
        <text_editor
-        follows="left|top"
+        follows="left|top|right"
         height="150"
         width="250"
         left="9"
@@ -41,7 +42,7 @@
        name="status_button_panel"
        height="25">
        <button
-        follows="left|top"
+        follows="left|bottom"
         top="0"
         left="9"
         height="23"
@@ -52,7 +53,7 @@
           function="SocialSharing.SendStatus" />
        </button>
        <button
-        follows="left|top"
+        follows="left|bottom"
         height="23"
         label="Cancel"
         name="cancel_status_btn"
-- 
cgit v1.2.3