Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.

Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry

22 files changed, 170 insertions, 90 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7703211c3d..dc5936a435 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,4 +1,5 @@
 <textures version="101">
+  <!-- Please add new files alphabetically to prevent merge conflicts. JC -->
 
   <texture name="ScrollThumb_Horiz" file_name="widgets/ScrollThumb_Horiz.png" preload="true" scale.left="4" scale.top="10" scale.bottom="53" scale.right="4" />
   <texture name="ScrollThumb_Vert" file_name="widgets/ScrollThumb_Vert.png" preload="true" scale.left="4" scale.top="53" scale.bottom="10" scale.right="4" />
@@ -469,7 +470,6 @@
   <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="true"/>
   <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="true"/>
   <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="true"/>
-  
   <texture name="Stepper_Down_Disabled" file_name="widgets/Stepper_Down_Disabled.png" preload="true"/>
   <texture name="Stepper_Down_Off" file_name="widgets/Stepper_Down_Off.png" preload="true"/>
   <texture name="Stepper_Down_Press" file_name="widgets/Stepper_Down_Press.png" preload="true"/>
@@ -477,4 +477,5 @@
   <texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="true"/>
   <texture name="Stepper_Up_Press" file_name="widgets/Stepper_Up_Press.png" preload="true"/>
 
+  <!-- Please add new files alphabetically to prevent merge conflicts. JC -->
 </textures>
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 1fb0942461..cb3388ccbc 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1147,7 +1147,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
                  name="online_status"
                  width="-1" />
                 <name_list.columns
-                 dynamicwidth="true"
+                 dynamic_width="true"
                  label="Name"
                  name="name" />
                 <name_list.columns
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 0856a787f3..44c56e4207 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -2,25 +2,66 @@
 <floater

  background_visible="true"

  follows="left|top|right|bottom"

- height="200"

+ height="250"

  layout="topleft"

  left="0"

  name="panel_im"

  top="0"

+ can_dock="true"

+ can_minimize="false"

  visible="false" 

- width="300">

-  <text_editor

-   enabled="false"

-   type="string"

-   length="1"

-   top="20" 

-   follows="left|top|right"

-   font="SansSerif"

-   height="175"

-   layout="topleft"

-   left="5"

-   name="im_text"

-   width="290"

-   word_wrap="true">

-  </text_editor>

+ width="315">

+  <layout_stack follows="left|top|right|bottom"

+                height="235"

+                width="315"

+                layout="topleft"

+                orientation="horizontal"

+                name="im_panels"

+                top="16"

+                left="2">

+    <layout_panel

+      class="panel_im_control_panel"

+      name="panel_im_control_panel"

+      filename="panel_im_control_panel.xml"

+      layout="topleft"

+      top_delta="-3"

+      min_width="96" 

+      width="96"

+      height="225"

+      label="IM Control Panel"

+      user_resize="false" />

+    <layout_panel height="235"

+                  width="200"

+                  left_delta="96" 

+                  top="0"

+                  user_resize="false">

+      <button height="12"

+              top="8" 

+              label="&lt;&lt;"

+              layout="topleft"

+              width="35"

+              name="slide_left_btn" />

+      <button height="12"

+              top="8"

+              label="&gt;&gt;"

+              layout="topleft"

+              width="35"

+              name="slide_right_btn" />

+      <text_editor

+       enabled="false"

+       type="string"

+       length="1"

+       follows="left|top|right"

+       font="SansSerif"

+       height="185"

+       layout="topleft"

+       max_length="2147483647"

+       name="im_text"

+       width="195"

+       word_wrap="true">

+      </text_editor>

+      <line_editor name="chat_editor" height="20" layout="topleft" width="190">

+      </line_editor>

+    </layout_panel>

+  </layout_stack>

 </floater>

diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index b11b3e4df5..b43cdca0d1 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -25,15 +25,15 @@
      tool_tip="Select an object from this list to highlight it in-world"
      top="20">
         <scroll_list.columns
-         dynamicwidth="true"
+         dynamic_width="true"
          label="Object Name"
          name="object_name" />
         <scroll_list.columns
-         dynamicwidth="true"
+         dynamic_width="true"
          label="Owner Name"
          name="owner_name" />
         <scroll_list.columns
-         dynamicwidth="true"
+         dynamic_width="true"
          label="Creator Name"
          name="creator_name" />
         <scroll_list.columns
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index eb05fe1883..6a54c187cb 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -23,7 +23,7 @@
      name="Fetched">
         Fetched
     </floater.string>
-    <search_editor
+    <filter_editor
      follows="left|top|right"
      height="16"
      label="Type here to search"
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index c6b158fe6f..c6c561b497 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -156,9 +156,9 @@
    width="200">
     Line Editor Sample Text
   </line_editor>
-  <!-- "search_editor" is a specialized line_editor that shows read-only
+  <!-- "filter_editor" is a specialized line_editor that shows read-only
        help text until the user clicks in the widget. -->
-  <search_editor
+  <filter_editor
    follows="left|top|right"
    height="20"
    label="Type here to search"
@@ -230,11 +230,11 @@
    tool_tip="scroll list" 
    layout="topleft">
     <scroll_list.columns
-     dynamicwidth="true"
+     dynamic_width="true"
      name="first_column"
      label="Column A"/>
     <scroll_list.columns
-     dynamicwidth="true"
+     dynamic_width="true"
      name="second_column"
      label="Column B"/>
   </scroll_list>
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 8d85519610..dc048eb352 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -86,7 +86,7 @@
      name="show_folders_check"
      top="20"
      width="201" />
-    <search_editor
+    <filter_editor
      follows="left|top|right"
      height="16"
      label="Type here to search"
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 6934fad495..bbb17dfb8f 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -163,6 +163,15 @@
          tool_tip="Closes the currently-displayed floater, if one exists"
          top_delta="0"
          width="85" />
+        <button
+         follows="left|top"
+         height="25"
+         label="Export Schema"
+         layout="topleft"
+         left_pad="10"
+         name="export_schema"
+         top_delta="0"
+         width="120" />
         <scroll_list
          bottom="525"
          column_padding="0"
@@ -185,7 +194,7 @@
              name="file_column"
              width="150" />
             <scroll_list.columns
-             dynamicwidth="true"
+             dynamic_width="true"
              label="Top-Level Node"
              name="top_level_node_column" />
         </scroll_list>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 7ac068df4b..bbef5a8892 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -13,6 +13,7 @@
  width="1000">
     <layout_stack
      border_size="0"
+     clip="false" 
      follows="left|right|bottom|top"
      height="28"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml
index a151eed20f..3a35465df2 100644
--- a/indra/newview/skins/default/xui/en/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_friends.xml
@@ -29,7 +29,7 @@
          tool_tip="Online status"
          width="20" />
         <scroll_list.columns
-         dynamicwidth="true"
+         dynamic_width="true"
          label="Name"
          name="friend_name"
          tool_tip="Name" />
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
new file mode 100644
index 0000000000..5067b4c1d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="panel_im_control_panel"

+       width="96"

+       height="215"

+       border="false">

+

+  <avatar_icon name="avatar_icon"

+               width="96"

+               height="96" />

+

+  <button name="view_profile_btn"

+          label="View Profile"

+          left_delta="3"

+          width="90"

+		  height="20" />

+

+  <button name="add_friend_btn"

+          label="Add Friend"

+          width="90"

+          height="20" />

+

+  <button name="call_btn"

+          label="Call"

+          width="90"

+          height="20" />

+

+  <button name="share_btn"

+          label="Share"

+          width="90"

+          height="20" />

+

+</panel>

diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 9d4c411201..c9a0b6bc38 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -101,37 +101,21 @@
 <!--      top_delta="0" -->
 <!--      width="168" /> -->
     
-    <button
-     follows="right|top"
-     height="16"
-     image_disabled="Search"
-     image_disabled_selected="Search"
-     image_selected="Search"
-     image_unselected="Search"
-     layout="topleft"
-     left_pad="5"
-     name="search_btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Search"
-     top_delta="2"
-     width="16" />
-    
-    <line_editor
+    <search_editor
      bevel_style="none"
      border_style="line"
      border.border_thickness="0"
      commit_on_focus_lost="false"
      follows="right|top"
      halign="right"
-     height="18"
+     height="20"
      label="Search All"
      layout="topleft"
-     left_pad="2"
+     left_pad="5"
      mouse_opaque="false"
      name="search_input"
      tool_tip="Search All"
-     top_delta="-1"
+     top_delta="0"
      width="135" /> 
     
     <button
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 4fc47d1c42..29f5d3aee8 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -7,9 +7,10 @@
   height="465"
   follows="left|top|right|bottom"  
   background_visible="true"
+  bg_alpha_color="0.3 0.3 0.3 1"
   label="People"
   name="people_panel">
- <search_editor
+  <filter_editor
     layout="topleft"
     top="3"
     left="15"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 61b0ac9b72..c91cb2394c 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -19,7 +19,7 @@
      name="teleport_history_tab_title">
         Teleport History
     </panel.string>
-    <search_editor
+    <filter_editor
      follows="left|top|right"
      height="20"
      label="Filter"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 330bc362d2..05ebcbb50b 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -6,7 +6,7 @@
 	     multi_select="false" name="history_items" search_column="1"
 	     sort_column="1" height="326" width="380" >
 		<column name="landmark_icon" width="20" />
-		<column dynamicwidth="true" label="Region" name="region" />
+		<column dynamic_width="true" label="Region" name="region" />
 		<column name="index" width="0" />
 	</scroll_list>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c6ee2ce364..149da313a2 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -82,6 +82,8 @@
 	<string name="BUTTON_MINIMIZE">Minimize</string>
 	<string name="BUTTON_TEAR_OFF">Tear Off</string>
 	<string name="BUTTON_EDIT">Edit</string>
+  <string name="BUTTON_DOCK">Dock</string>
+  <string name="BUTTON_UNDOCK">Undock</string>
 
 	<!-- searching - generic -->
 	<string name="Searching">Searching...</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
new file mode 100644
index 0000000000..f77aa396ec
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<filter_editor select_on_focus="true"

+               background="TextField_Search_Off" >

+  <clear_filter_button label="" 

+                       image_unselected="Icon_Close_Foreground"

+                       image_selected="Icon_Close_Press" />

+</filter_editor>

diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index 168609d5d7..08205cacbc 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<line_editor background_image="TextField_Off"
+<line_editor
+  background_image="TextField_Off"
+  background_image_disabled="TextField_Disabled"
+  background_image_focused="TextField_Active"
              select_on_focus="false"
              handle_edit_keys_directly="false"
              commit_on_focus_lost="true"
@@ -8,9 +11,8 @@
              text_color="TextFgColor"
              text_readonly_color="Green"
              text_tentative_color="TextFgTentativeColor"
-             bg_readonly_color="TextBgReadOnlyColor"
-             bg_writeable_color="TextBgWriteableColor"
-             bg_focus_color="TextBgFocusColor"
+			 highlight_color="EmphasisColor"
+			 preedit_bg_color="White"
              mouse_opaque="true"
              name="line_editor"
              font="SansSerifSmall">
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
index 9e2c52acca..e3a53eee4d 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
@@ -4,7 +4,7 @@
              bg_selected_color="ScrollSelectedBGColor"
              fg_disable_color="ScrollDisabledColor"
              bg_writeable_color="ScrollBgWriteableColor"
-             bg_read_only_color="ScrollBgReadOnlyColor"
+             bg_readonly_color="ScrollBgReadOnlyColor"
              bg_stripe_color="ScrollBGStripeColor"
              hovered_color="ScrollHoveredColor"
              highlighted_color="ScrollHighlightedColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index 67588d76ca..6f557e239d 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<search_editor select_on_focus="true">
-  <clear_search_button image_unselected="TextField_Search_Off"
-                       image_selected="TextField_Search_Active"
-                       image_disabled="TextField_Search_Disabled"
-                       image_color="TextFgTentativeColor"/>
+<search_editor
+  select_on_focus="true"
+  background_image="TextField_Search_Off"
+  background_image_disabled="TextField_Search_Disabled"
+  background_image_focused="TextField_Search_Active" >
+  <search_button label=""
+	  image_unselected="Search"
+	  image_selected="Search" />
 </search_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index b39c2991a0..960c4e81e5 100644
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
@@ -1,11 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<simple_text_editor cursor_color="TextCursorColor"
-                    default_color="TextDefaultColor"
-                    text_color="TextFgColor"
-                    text_readonly_color="TextFgReadOnlyColor"
-                    bg_readonly_color="TextBgReadOnlyColor"
-                    bg_writeable_color="TextBgWriteableColor"
-                    bg_focus_color="TextBgFocusColor"
-                    hide_border="true"
-                    hide_scrollbar="false"
-                    font="SansSerif"/>
+<simple_text_editor
+  mouse_opaque="true"
+  font="SansSerifSmall"
+  max_length="255" 
+  embedded_items="false" 
+  hide_scrollbar="false"
+  hide_border="true"
+  word_wrap="false" 
+  ignore_tab="true"
+  track_bottom="false" 
+  takes_non_scroll_clicks="true" 
+  cursor_color="TextCursorColor"
+  default_color="TextDefaultColor"
+  text_color="TextFgColor"
+  text_readonly_color="TextFgReadOnlyColor"
+  bg_readonly_color="TextBgReadOnlyColor"
+  bg_writeable_color="TextBgWriteableColor"
+  bg_focus_color="TextBgFocusColor">
+  <simple_text_editor.border
+    bevel_style="in"
+    follows="all" />
+</simple_text_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
index a613c43f90..deaade04f8 100644
--- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
@@ -1,19 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<line_editor background_image="TextField_Off"
-             select_on_focus="false"
-             handle_edit_keys_directly="false"
-             commit_on_focus_lost="true"
-             ignore_tab="true"
-             cursor_color="TextCursorColor"
-             text_color="TextFgColor"
-             text_readonly_color="TextFgReadOnlyColor"
-             text_tentative_color="TextFgTentativeColor"
-             bg_readonly_color="TextBgReadOnlyColor"
-             bg_writeable_color="TextBgWriteableColor"
-             bg_focus_color="TextBgFocusColor"
-             mouse_opaque="true"
-             name="line_editor"
-             font="SansSerifSmall">
-  <line_editor.border bevel_style="in"
-                      follows="all" />
-</line_editor>
+<!-- Core parameters are in simple_text_editor.xml -->
+<text_editor
+  allow_html="false" />