From f2acd554bcf8326824acc23457a38a70021b0026 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 8 Sep 2011 16:34:54 -0700
Subject: Clean up erroneous XUI parsing errors.

---
 .../default/xui/en/floater_voice_controls.xml      |  1 -
 indra/newview/skins/default/xui/en/panel_login.xml |  1 -
 .../newview/skins/default/xui/en/panel_people.xml  |  2 +-
 indra/newview/skins/default/xui/en/panel_picks.xml | 23 +++++++++++-----------
 .../newview/skins/default/xui/en/panel_places.xml  |  2 +-
 .../newview/skins/default/xui/en/panel_profile.xml |  2 +-
 .../default/xui/en/panel_sidetray_home_tab.xml     |  1 -
 .../skins/default/xui/en/panel_status_bar.xml      |  3 ---
 .../skins/default/xui/en/sidepanel_appearance.xml  |  2 +-
 .../skins/default/xui/en/widgets/accordion.xml     |  2 +-
 .../skins/default/xui/en/widgets/menu_bar.xml      |  2 +-
 .../skins/default/xui/en/widgets/radio_group.xml   |  3 +--
 12 files changed, 18 insertions(+), 26 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 1432099590..f017a7ace6 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -89,7 +89,6 @@
         <layout_panel name="leave_call_panel" height="26" auto_resize="false">
         <layout_stack
          clip="true"
-         auto_resize="false"
          follows="left|top|right"
          height="26"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 983f93cb03..1c3e08d59b 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -27,7 +27,6 @@ bg_opaque_color="Black"
 border_visible="false"
 bottom="600"
 follows="all"
-hide_loading="true"
 left="0"
 name="login_html"
 start_url=""
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index cc4522f944..0ebfd9c037 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -66,7 +66,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      layout="topleft"
      left="10"
      label="Filter"
-     max_length="300"
+     max_length_chars="300"
      name="filter_input"
      text_color="Black"
      text_pad_left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 978b204df9..87e263726d 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -72,20 +72,19 @@ bg_opaque_color="DkGray2"
     </accordion_tab>
  </accordion>
    <panel
-bg_opaque_color="DkGray2"
+       bg_opaque_color="DkGray2"
        background_visible="true"
        background_opaque="true"
-         bevel_style="none"
-         enabled="false"
-         auto_resize="false"
-         follows="bottom|left|right"
-         left="1"
-         height="27"
-         label="bottom_panel"
-         layout="bottom"
-         name="edit_panel"
-         top_pad="-2"
-         width="313">
+       bevel_style="none"
+       enabled="false"
+       follows="bottom|left|right"
+       left="1"
+       height="27"
+       label="bottom_panel"
+       layout="bottom"
+       name="edit_panel"
+       top_pad="-2"
+       width="313">
          
          <layout_stack
 		  follows="bottom|left|right"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index b6b8a337a1..5d7334f780 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -25,7 +25,7 @@ background_visible="true"
      layout="topleft"
      left="10"
      label="Filter My Places"
-     max_length="300"
+     max_length_chars="300"
      name="Filter"
      top="3"
      width="303" />
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index cb701e03da..f5a9daa994 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -277,7 +277,7 @@
                initial_value="(retrieving)"
                layout="topleft"
                left="0"
-               link="true"
+               parse_urls="true"
                name="partner_text"
                top="0"
                use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 72b2f5e84f..912f81f915 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -24,7 +24,6 @@
      layout="topleft"
      left_delta="0"
      name="browser_layout"
-     orientation="vertical" 
      top_delta="0"
      width="313">
       <web_browser
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index c780cf2696..5894abd03b 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -44,7 +44,6 @@
     background_opaque="true" 
     bg_opaque_image="bevel_background">
     <text
-     auto_resize="true"
      halign="center"
      font="SansSerifSmall"
      follows="all"
@@ -58,7 +57,6 @@
      value="L$20" 
      width="40" />
     <button
-     auto_resize="true"
      halign="center"
      font="SansSerifSmall"
      follows="right|top|bottom"
@@ -84,7 +82,6 @@
     top="0"
     width="120"
     height="20"
-    pad_left="5"
     name="mode_combo"
     tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
     >
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index b5839878d5..1d98a84e25 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -114,7 +114,7 @@ width="333">
    layout="topleft"
    left="10"
    label="Filter Outfits"
-   max_length="300"
+   max_length_chars="300"
    name="Filter"
    search_button_visible="true"
    top_pad="10"
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
index 1a66f0f5c5..55dde492ca 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml
@@ -16,7 +16,7 @@
      name="no_matched_tabs_msg"
      v_pad="15"
      width="200"
-     wrap="true "/>
+     wrap="true"/>
     <!-- This widget will not be created in viewer. Only its value will be used for empty accordion without filter. -->
     <no_visible_tabs_text
      name="no_visible_tabs_msg"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
index ee3ef0cd7a..27efa72563 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu_bar
-  			can_tear_off = "false"
+			tear_off = "false"
 			keep_fixed_size = "true"
 			horizontal_layout = "true"
 			visible = "true"
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
index ad7ef5bffc..ab3184d34b 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<radio_group draw_border="false"
-             name="radio_group"
+<radio_group name="radio_group"
              mouse_opaque="false"
              follows="left|top"
              font="SansSerifSmall"/>
-- 
cgit v1.2.3