ACME-630 Adjust floater_social.xml to load panels from files instead of in-lining

2 files changed, 10 insertions, 404 deletions

diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp
index e305bfd10a..594773c556 100644
--- a/indra/newview/llfloatersocial.cpp
+++ b/indra/newview/llfloatersocial.cpp
@@ -507,7 +507,7 @@ BOOL LLFloaterSocial::postBuild()
     // Initiate a connection to Facebook (getConnectionToFacebook() handles the already connected state)
     LLFacebookConnect::instance().getConnectionToFacebook();
     // Keep tab of the Photo Panel
-	mSocialPhotoPanel = static_cast<LLSocialPhotoPanel*>(getChild<LLUICtrl>("social_photo_tab"));
+	mSocialPhotoPanel = static_cast<LLSocialPhotoPanel*>(getChild<LLUICtrl>("panel_social_photo"));
 	return LLFloater::postBuild();
 }
 
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>