Merge after pull from viewer 2.0 changes

23 files changed, 887 insertions, 163 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index b46b766fc0..d3366cdcaa 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -144,6 +144,7 @@
   <texture name="Info" file_name="icons/Info.png" preload="false" />
   <texture name="Info_Small" file_name="icons/Info_Small.png" preload="false" />
   <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false" />
+  <texture name="Info_Over" file_name="icons/Info_Over.png" preload="false" />
   <texture name="Info_Press" file_name="navbar/Info_Press.png" preload="false" />
 
   <texture name="Inspector_Background" file_name="windows/Inspector_Background.png" preload="false" />
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 072fafd06e..aa0b4094b4 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -28,7 +28,9 @@
      follows="left|top|right|bottom"
      height="400"
      layout="topleft"
+     font="SansSerifSmall"
      left="1"
+       tab_padding_right="5"
      name="landtab"
      tab_position="top"
      top="20"
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 520249c2a2..a713cc32a0 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_dock="true"
- can_minimize="true"
- can_close="true" 
+ can_minimize="false"
+ can_close="true"
  center_horiz="true"
- follows="top"
- height="110"
+ follows="bottom"
+ height="152"
  layout="topleft"
  name="camera_floater"
  help_topic="camera_floater"
  save_rect="true"
  save_visibility="true"
- width="105">
+ width="150">
     <floater.string
      name="rotate_tooltip">
         Rotate Camera Around Focus
@@ -25,69 +25,71 @@
         Move Camera Up and Down, Left and Right
     </floater.string>
     <panel
-     border="true"
-     height="79"
+     border="false"
+     height="110"
      layout="topleft"
-     left="0"
+     left="2"
      top="0"
-     mouse_opaque="false" 
+     mouse_opaque="false"
      name="controls"
-     width="105">
-        <joystick_rotate
-         follows="top|left"
-         height="64"
-         image_selected="cam_rotate_in.tga"
-         image_unselected="cam_rotate_out.tga"
-         layout="topleft"
-         left="2"
-         name="cam_rotate_stick"
-         picture_style="true"
-         quadrant="left"
-         scale_image="false"
-         sound_flags="3"
-         tool_tip="Orbit camera around focus"
-         top="15"
-         width="64" />
+     width="148">
         <joystick_track
          follows="top|left"
-         height="64"
-         image_selected="cam_tracking_in.tga"
-         image_unselected="cam_tracking_out.tga"
+         height="78"
+         image_selected="Cam_Tracking_In"
+         image_unselected="Cam_Tracking_Out"
          layout="topleft"
-         left="2"
+         left="45"
          name="cam_track_stick"
          picture_style="true"
          quadrant="left"
          scale_image="false"
          sound_flags="3"
          tool_tip="Move camera up and down, left and right"
-         top="15"
+         top="22"
          visible="false"
-         width="64" />
+         width="78" />
+         <!--TODO: replace with slider, + - images -->
         <joystick_zoom
          follows="top|left"
-         height="64"
-         image_unselected="cam_zoom_out.tga"
+         height="78"
+         image_unselected="ScrollThumb_Vert"
          layout="topleft"
-         left_delta="70"
-         minus_image="cam_zoom_minus_in.tga"
+         left="7"
+         minus_image="ScrollThumb_Vert"
          name="zoom"
          picture_style="true"
-         plus_image="cam_zoom_plus_in.tga"
+         plus_image="ScrollThumb_Vert"
          quadrant="left"
          scale_image="false"
          sound_flags="3"
          tool_tip="Zoom camera toward focus"
-         top_delta="0"
-         width="16" />
+         top="22"
+         width="20" />
+         <joystick_rotate
+         follows="top|left"
+         height="78"
+         image_selected="Cam_Rotate_In"
+         image_unselected="Cam_Rotate_Out"
+         layout="topleft"
+         left="45"
+         name="cam_rotate_stick"
+         picture_style="true"
+         quadrant="left"
+         scale_image="false"
+         sound_flags="3"
+         visible="true"
+         tool_tip="Orbit camera around focus"
+         top="22"
+         width="78" />
         <panel
-         height="70"
+         height="78"
          layout="topleft"
-         left="15"
+         left="36"
          name="camera_presets"
-         top="15"
+         top="30"
          visible="false"
-         width="75">
+         width="78">
             <button
              height="30"
              image_selected="CameraPreset_Rear"
@@ -127,7 +129,7 @@
              name="front_view"
              picture_style="true"
              tool_tip="Front View"
-             top_pad="2"
+             top_pad="5"
              width="30">
                 <click_callback
                  function="CameraPresets.ChangeView"
@@ -151,21 +153,21 @@
         </panel>
     </panel>
     <panel
-     border="true"
-     height="25"
+     border="false"
+     height="42"
      layout="topleft"
-     left="0"
-     top_pad="1"
+     left="2"
+     top_pad="0"
      name="buttons"
-     width="105">
+     width="148">
         <button
          height="23"
          label=""
          layout="topleft"
-         left="2"
+         left="23"
          is_toggle="true"
          image_overlay="Cam_Orbit_Off"
-         image_selected="PushButton_Selected_Press" 
+         image_selected="PushButton_Selected_Press"
          name="orbit_btn"
          tab_stop="false"
          tool_tip="Orbit camera"
@@ -179,7 +181,7 @@
          left_pad="0"
          is_toggle="true"
          image_overlay="Cam_Pan_Off"
-         image_selected="PushButton_Selected_Press" 
+         image_selected="PushButton_Selected_Press"
          name="pan_btn"
          tab_stop="false"
          tool_tip="Pan camera"
@@ -191,7 +193,7 @@
          layout="topleft"
          left_pad="0"
          image_overlay="Cam_Avatar_Off"
-         image_selected="PushButton_Selected_Press" 
+         image_selected="PushButton_Selected_Press"
          name="avatarview_btn"
          tab_stop="false"
          tool_tip="See as avatar"
@@ -204,12 +206,11 @@
          left_pad="0"
          is_toggle="true"
          image_overlay="Cam_FreeCam_Off"
-         image_selected="PushButton_Selected_Press" 
+         image_selected="PushButton_Selected_Press"
          name="freecamera_btn"
          tab_stop="false"
          tool_tip="View object"
          width="25">
         </button>
-        
     </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 0bd4b441c6..d24d1b7064 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -14,7 +14,7 @@
  save_rect="true"
  title="Nearby Chat"
  save_visibility="true"
- single_instance="true" 
+ single_instance="true"
  width="320">
             <chat_history
              allow_html="true" 
diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml
index 5f70f09a34..69525d48d2 100644
--- a/indra/newview/skins/default/xui/en/floater_pay.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay.xml
@@ -34,7 +34,7 @@
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="16"
      layout="topleft"
      left_pad="7"
@@ -44,6 +44,7 @@
     </text>
     <button
      height="23"
+     font="SansSerifSmall"  
      label="L$1"
      label_selected="L$1"
      layout="topleft"
@@ -53,7 +54,8 @@
      width="80" />
     <button
      height="23"
-     label="L$5"
+     label="L$1"
+     font="SansSerif"  
      label_selected="L$5"
      layout="topleft"
      left_pad="15"
@@ -62,6 +64,7 @@
     <button
      height="23"
      label="L$10"
+     font="SansSerifHuge"  
      label_selected="L$10"
      layout="topleft"
      left="25"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index 8cdafe110a..d2b8455eab 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -83,7 +83,7 @@
         Loading...
     </text_editor>
     <button
-     follows="left|bottom"
+     follows="right|bottom"
      height="22"
      label="Save"
      label_selected="Save"
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index abde4ba5fa..884532c7a3 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -14,19 +14,19 @@
      allow_no_texture="true"
      default_image_name="None"
      follows="left|top"
-     height="125"
+     height="150"
      layout="topleft"
-     left="10"
-     name="screenshot"
-     top="23"
-     width="160" />
+     left="60"
+     name=""
+     top="15"
+     width="220" />
     <check_box
      height="15"
      label="Use this screenshot"
      layout="topleft"
-     left_pad="5"
+     left="8"
      name="screen_check"
-     top="120"
+     top_pad="-12"
      width="116" />
     <text
      type="string"
@@ -38,8 +38,8 @@
      layout="topleft"
      left="10"
      name="reporter_title"
-     top="140"
-     width="60">
+     top_pad="0"
+     width="100">
         Reporter:
     </text>
     <text
@@ -48,24 +48,25 @@
      follows="left|top"
      height="16"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="reporter_field"
      top_delta="0"
-     width="193">
-        Loremipsum Dolorsitamut
+     use_ellipses="true"
+     width="200">
+        Loremipsum Dolorsitamut Longnamez
     </text>
     <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
-     font.name="SansSerif" 
+     font.name="SansSerif"
      font.style="BOLD"
      layout="topleft"
      left="10"
      name="sim_title"
-     top_pad="5"
-     width="60">
+     top_pad="2"
+     width="100">
         Region:
     </text>
     <text
@@ -74,10 +75,11 @@
      follows="left|top"
      height="16"
      layout="topleft"
-     left_pad="2"
+     left_pad="5"
      name="sim_field"
      top_delta="0"
-     width="193">
+     use_ellipses="true"
+     width="200">
         Region Name
     </text>
     <text
@@ -85,13 +87,13 @@
      length="1"
      follows="left|top"
      height="16"
-     font.name="SansSerif" 
+     font.name="SansSerif"
      font.style="BOLD"
      layout="topleft"
      left="10"
      name="pos_title"
-     top_pad="5"
-     width="50">
+     top_pad="2"
+     width="100">
         Position:
     </text>
     <text
@@ -100,10 +102,10 @@
      follows="left|top"
      height="16"
      layout="topleft"
-     left_pad="12"
+     left_pad="5"
      name="pos_field"
      top_delta="0"
-     width="193">
+     width="200">
         {128.1, 128.1, 15.4}
     </text>
  <text
@@ -114,7 +116,7 @@
      layout="topleft"
      left="10"
      name="select_object_label"
-     top_pad="5"
+     top_pad="2"
      width="310">
         Click the button, then the abusive object:
     </text>
@@ -133,13 +135,13 @@
      length="1"
      follows="left|top"
      height="16"
-     font.name="SansSerif" 
+     font.name="SansSerif"
      font.style="BOLD"
      layout="topleft"
      left="48"
      name="object_name_label"
      top_delta="0"
-     width="60">
+     width="80">
         Object:
     </text>
     <text
@@ -151,7 +153,8 @@
      left_pad="6"
      name="object_name"
      top_delta="0"
-     width="157">
+     use_ellipses="true"
+     width="185">
         Consetetur Sadipscing
     </text>
     <text
@@ -159,13 +162,13 @@
      length="1"
      follows="left|top"
      height="16"
-     font.name="SansSerif" 
+     font.name="SansSerif"
      font.style="BOLD"
      layout="topleft"
      left="48"
      name="owner_name_label"
      top_pad="0"
-     width="60">
+     width="80">
         Owner:
     </text>
     <text
@@ -177,8 +180,9 @@
      left_pad="6"
      name="owner_name"
      top_delta="0"
-     width="157">
-        Hendrerit Vulputate
+     use_ellipses="true"
+     width="185">
+        Hendrerit Vulputate Kamawashi Longname
     </text>
     <combo_box
      height="23"
@@ -349,8 +353,8 @@
      type="string"
      length="1"
      follows="left|top"
-     height="16"
-     font.name="SansSerif" 
+     height="14"
+     font.name="SansSerif"
      font.style="BOLD"
      layout="topleft"
      left_delta="0"
@@ -368,11 +372,10 @@
      left_delta="0"
      max_length="32"
      name="abuser_name_edit"
-     top_pad="2"
+     top_pad="0"
      width="195" />
     <button
      height="23"
-     font="SansSerifSmall"
      label="Choose"
      layout="topleft"
      left_pad="5"
@@ -394,13 +397,13 @@
      type="string"
      length="1"
      follows="left|top"
-     height="16"
-     font.name="SansSerif" 
+     height="14"
+     font.name="SansSerif"
      font.style="BOLD"
      layout="topleft"
      left="10"
      name="abuser_name_title2"
-     top_pad="5"
+     top_pad="2"
      width="313">
         Location of Abuse:
     </text>
@@ -413,19 +416,19 @@
      left="10"
      max_length="256"
      name="abuse_location_edit"
-     top_pad="2"
+     top_pad="0"
      width="313" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
-     font.name="SansSerif" 
+     font.name="SansSerif"
      font.style="BOLD"
      layout="topleft"
      left_delta="0"
      name="sum_title"
-     top_pad="5"
+     top_pad="2"
      width="313">
         Summary:
     </text>
@@ -438,14 +441,14 @@
      left_delta="0"
      max_length="64"
      name="summary_edit"
-     top_pad="2"
+     top_pad="0"
      width="313" />
     <text
      type="string"
      length="1"
      follows="left|top"
-     height="16"
-     font.name="SansSerif" 
+     height="14"
+     font.name="SansSerif"
      font.style="BOLD"
      layout="topleft"
      left_delta="0"
@@ -461,9 +464,9 @@
      height="16"
      layout="topleft"
      name="bug_aviso"
-     left_pad="0"
+     left_pad="10"
      width="200">
-        Please be as specific as possible.
+        Please be as specific as possible
     </text>
     <text_editor
      follows="left|top"
@@ -479,16 +482,15 @@
      type="string"
      length="1"
      follows="left|top"
-     height="50"
+     height="30"
      layout="topleft"
      left="10"
-     font.name="SansSerif" 
-     font.style="BOLD"
+     font.name="SansSerifSmall"
      name="incomplete_title"
-     top_pad="5"
+     top_pad="2"
      word_wrap="true"
      width="313">
-        Note: Incomplete reports won't be investigated.
+        * Incomplete reports won't be investigated
     </text>
      <button
      left="80"
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 8305452c85..c33ab8aa70 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -114,16 +114,59 @@
         Escaped greater than &gt;
     </text>
     <text
-     type="string"
-     length="1"
-     bottom="390"
-     label="N"
-     layout="topleft"
-     left="10"
-     name="floater_map_north"
-     right="30"
-     text_color="1 1 1 0.7"
-     top="370">
-        N
-    </text>
+   type="string"
+   length="1"
+   bottom="390"
+   label="N"
+   layout="topleft"
+   left="10"
+   name="right_aligned_text"
+   width="380"
+   halign="right" 
+   text_color="1 1 1 0.7"
+   top_pad="10">
+    Right aligned text
+  </text>
+  <text
+ type="string"
+ length="1"
+ bottom="390"
+ label="N"
+ layout="topleft"
+ left="10"
+ name="centered_text"
+ width="380"
+ halign="center"
+ text_color="1 1 1 0.7"
+ top_pad="10">
+    Centered text
+  </text>
+  <text
+ type="string"
+ length="1"
+ bottom="390"
+ label="N"
+ layout="topleft"
+ left="10"
+ name="centered_text"
+ width="380"
+ halign="left"
+ text_color="1 1 1 0.7"
+ top_pad="10">
+    Left aligned text
+  </text>
+  <text
+   type="string"
+   length="1"
+   bottom="390"
+   label="N"
+   layout="topleft"
+   left="10"
+   name="floater_map_north"
+   right="30"
+   text_color="1 1 1 0.7"
+   top="370">
+    N
+  </text>
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
index cc17e9dd4b..eedb4383bb 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
@@ -23,9 +23,14 @@
        parameter="sort_status" />
   </menu_item_check>
   <menu_item_separator layout="topleft" />
-  <menu_item_call name="view_icons" label="View People Icons">
-    <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="view_icons" />
-  </menu_item_call>
+  <menu_item_check name="view_icons" label="View People Icons">
+    <menu_item_check.on_click
+     function="People.Friends.ViewSort.Action"
+     parameter="view_icons" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="FriendsListShowIcons" />
+  </menu_item_check>
   <menu_item_call name="organize_offline" label="Organize Offline Friends">
     <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="organize_offline" />
   </menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index f91a961388..c002cd078f 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -12,9 +12,14 @@
     <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="sort_distance" />
   </menu_item_call>
   <menu_item_separator layout="topleft" />
-  <menu_item_call name="view_icons" label="View People Icons">
-    <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="view_icons" />
-  </menu_item_call>
+  <menu_item_check name="view_icons" label="View People Icons">
+    <menu_item_check.on_click
+     function="People.Nearby.ViewSort.Action"
+     parameter="view_icons" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="NearbyListShowIcons" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
     <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
index d09871cff3..cfd6dc78b6 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
@@ -23,9 +23,14 @@
        parameter="sort_name" />
   </menu_item_check>
   <menu_item_separator layout="topleft" />
-  <menu_item_call name="view_icons" label="View People Icons">
-    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="view_icons" />
-  </menu_item_call>
+  <menu_item_check name="view_icons" label="View People Icons">
+    <menu_item_check.on_click
+     function="People.Recent.ViewSort.Action"
+     parameter="view_icons" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="RecentListShowIcons" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
     <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
diff --git a/indra/newview/skins/default/xui/en/menu_place_add_button.xml b/indra/newview/skins/default/xui/en/menu_place_add_button.xml
new file mode 100644
index 0000000000..e3a39a1242
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_place_add_button.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_folder_gear"
+ visible="false">
+    <menu_item_call
+     label="Add Folder"
+     layout="topleft"
+     name="add_folder">
+        <on_click
+         function="Places.LandmarksGear.Add.Action"
+         parameter="category" />
+        <on_enable
+         function="Places.LandmarksGear.Enable"
+         parameter="category" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add Landmark"
+     layout="topleft"
+     name="add_landmark">
+        <on_click
+         function="Places.LandmarksGear.Add.Action"
+         parameter="add_landmark" />
+    </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..8db745fab7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ name="panel_im_control_panel"
+ width="146"
+ height="215"
+ border="false">
+    <avatar_list
+     color="DkGray2"
+     follows="left|top|right|bottom"
+     height="130"
+     ignore_online_status="true"
+     layout="topleft"
+     left="3"
+     name="speakers_list"
+     opaque="false"
+     top="10"
+     width="140" />
+    <button
+     name="call_btn"
+     label="Call"
+     width="90"
+     height="20" />
+    <button
+     name="end_call_btn"
+     label="End Call"
+     width="90"
+     height="20" 
+     visible="false"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 9767a673f6..15b6b2a00d 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -7,12 +7,14 @@
     <avatar_list
      color="DkGray2"
      follows="left|top|right|bottom"
-     height="150"
+     height="130"
+     ignore_online_status="true"
      layout="topleft"
      left="3"
      name="speakers_list"
+     opaque="false"
      top="10"
-     width="140"/>
+     width="140" />
     <button
      name="group_info_btn"
      label="Group Info"
@@ -24,4 +26,10 @@
      label="Call"
      width="90"
      height="20" />
+    <button
+     name="end_call_btn"
+     label="End Call"
+     width="90"
+     height="20" 
+     visible="false"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 75ded4f249..af1919bd8f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -486,7 +486,7 @@ things in this group. There&apos;s a broad variety of Abilities.
         </panel>
     </tab_container>
     <panel
-     height="170"
+     height="190"
      layout="topleft"
      follows="left|top"
      left="10"
@@ -556,7 +556,7 @@ things in this group. There&apos;s a broad variety of Abilities.
         </scroll_list>
     </panel>
     <panel
-     height="215"
+     height="252"
      layout="topleft"
      left_delta="0"
      name="roles_footer"
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
index 7dc94d1141..dca52def49 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_im_control_panel"
        width="96"
-       height="215"
+       height="225"
        border="false">
 
   <avatar_icon name="avatar_icon"
@@ -24,6 +24,13 @@
           width="90"
           height="20" />
 
+    <button
+     height="20"
+     label="End Call"
+     name="end_call_btn"
+     visible="false"
+     width="90" />
+
   <button name="share_btn"
           label="Share"
           width="90"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index c33f68eaf7..5293043ba7 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -114,22 +114,10 @@
          image_disabled="AddItem_Disabled"
          layout="topleft"
          left_pad="5"
-         name="add_landmark_btn"
+         name="add_btn"
          picture_style="true"
          tool_tip="Add new landmark"
          width="18" />
-        <button
-         follows="bottom|left"
-         height="18"
-         image_selected="AddItem_Press"
-         image_unselected="AddItem_Off"
-         image_disabled="AddItem_Disabled"
-         layout="topleft"
-         left_pad="5"
-         name="add_folder_btn"
-         picture_style="true"
-         tool_tip="Add new folder"
-         width="18" />
         <dnd_button
          follows="bottom|right"
          height="18"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 7b19ab1a1c..69089e0e26 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -49,11 +49,13 @@ background_visible="true"
      height="500"
      layout="topleft"
      left="10"
+       font="SansSerifBigBold"
      name="tabs"
      tab_min_width="70"
      tab_height="30"
      tab_position="top"
      top_pad="10"
+     halign="center"  
      width="313">
         <panel
          follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
new file mode 100644
index 0000000000..b21fbc1795
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -0,0 +1,594 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	follows="left|right|top|bottom"
+	name="MediaControls"
+	bg_alpha_color="1 1 1 0"
+	height="160"
+	layout="topleft"
+	mouse_opaque="false"
+	width="800">
+  <panel
+	  name="media_region"
+	  bottom="125"
+	  follows="left|right|top|bottom"
+	  layout="topleft"
+	  left="20"
+	  mouse_opaque="false"
+	  right="-20"
+	  top="20" />
+  <layout_stack
+	  follows="left|right|bottom"
+	  height="32"
+	  layout="topleft"
+	  animate="false"
+	  left="0"
+	  orientation="horizontal"
+	  top="96">
+	<!-- outer layout_panels center the inner one -->
+	<layout_panel
+		width="0"
+		layout="topleft"
+		user_resize="false" />
+	<panel
+		name="media_progress_indicator"
+		height="22"
+		layout="topleft"
+		left="0"
+		top="0"
+		auto_resize="false"
+		user_resize="false"
+		min_width="100"
+		width="200">
+	  <progress_bar
+		  name="media_progress_bar"
+		  color_bar="1 1 1 0.96"
+		  follows="left|right|top"
+		  height="16"
+		  layout="topleft"
+		  left="0"
+		  tool_tip="Media is Loading"/>
+	</panel>
+	<layout_panel
+		width="0"
+		layout="topleft"
+		user_resize="false" />
+  </layout_stack>
+  <layout_stack
+	  name="media_controls"
+	  follows="left|right"
+	  animate="false"
+	  height="32"
+	  layout="topleft"
+	  left="0"
+	  orientation="horizontal"
+	  top="128">
+	<!-- outer layout_panels center the inner one -->
+	<layout_panel
+		width="0"
+		layout="topleft"
+		user_resize="false" />
+	<layout_panel
+		name="back"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		min_width="22"
+		width="22"
+		top="4">
+	  <button
+		  auto_resize="false"
+		  height="22"
+		  image_selected="media_btn_back.png"
+		  image_unselected="media_btn_back.png"
+		  layout="topleft"
+		  tool_tip="Step back"
+		  picture_style="true"
+		  width="22"
+		  top_delta="4">
+		<button.commit_callback
+			function="MediaCtrl.Back" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="fwd"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="10"
+		min_width="17"
+		width="17">
+	  <button
+		  height="22"
+		  image_selected="media_btn_forward.png"
+		  image_unselected="media_btn_forward.png"
+		  layout="topleft"
+		  tool_tip="Step forward"
+		  picture_style="true"
+		  top_delta="0"
+		  min_width="17"
+		  width="17">
+		<button.commit_callback
+			function="MediaCtrl.Forward" />
+	  </button>
+	</layout_panel>
+<!--
+	<panel
+		height="22"
+		layout="topleft"
+		auto_resize="false"
+		min_width="3"
+		width="3">
+	  <icon
+		  height="22"
+		  image_name="media_panel_divider.png"
+		  layout="topleft"
+		  top="0"
+		  min_width="3"
+		  width="3" />
+	</panel>
+-->
+	<layout_panel
+		name="home"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="-2"
+		min_width="22"
+		width="22">
+	  <button
+		  height="22"
+		  image_selected="media_btn_home.png"
+		  image_unselected="media_btn_home.png"
+		  layout="topleft"
+		  tool_tip="Home page"
+		  picture_style="true"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Home" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="media_stop"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="2"
+		min_width="22"
+		width="22">
+	  <button
+		  height="22"
+		  image_selected="button_anim_stop.tga"
+		  image_unselected="button_anim_stop.tga"
+		  layout="topleft"
+		  tool_tip="Stop media"
+		  picture_style="true"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Stop" />
+	  </button>
+	</layout_panel>
+<!--
+	<panel
+		height="22"
+		layout="topleft"
+		auto_resize="false"
+		min_width="3"
+		width="3">
+	  <icon
+		  height="22"
+		  image_name="media_panel_divider.png"
+		  layout="topleft"
+		  top="0"
+		  min_width="3"
+		  width="3" />
+	</panel>
+-->
+	<layout_panel
+		name="reload"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="6"
+		min_width="22"
+		width="22">
+	  <button
+		  height="22"
+		  image_selected="media_btn_reload.png"
+		  image_unselected="media_btn_reload.png"
+		  layout="topleft"
+		  tool_tip="Reload"
+		  picture_style="true"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Reload" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="stop"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="10"
+		min_width="22"
+		width="22">
+	  <button
+		  height="22"
+		  image_selected="media_btn_stoploading.png"
+		  image_unselected="media_btn_stoploading.png"
+		  layout="topleft"
+		  picture_style="true"
+		  tool_tip = "Stop loading"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Stop" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="play"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="14"
+		min_width="22"
+		width="22">
+	  <button
+		  height="22"
+		  image_selected="button_anim_play.tga"
+		  image_unselected="button_anim_play.tga"
+		  layout="topleft"
+		  tool_tip = "Play media"
+		  picture_style="true"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Play" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="pause"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="18"
+		min_width="22"
+		width="22">
+	  <button
+		  height="22"
+		  image_selected="button_anim_pause.tga"
+		  image_unselected="button_anim_pause.tga"
+		  layout="topleft"
+		  tool_tip = "Pause media"
+		  picture_style="true">
+		<button.commit_callback
+			function="MediaCtrl.Pause" />
+	  </button>
+	</layout_panel>
+	<!-- media URL entry  -->
+	<layout_panel
+		name="media_address"
+		auto_resize="true"
+		user_resize="false"
+		height="22"
+		follows="left|right|bottom"
+		layout="topleft"
+		width="190"
+		min_width="90">
+	  <!--
+		  RE-ENABLE THIS WHEN WE HAVE A HISTORY DROP-DOWN AGAIN
+
+<combo_box
+name="media_address_url"
+allow_text_entry="true"
+height="22"
+layout="topleft"
+max_chars="1024"
+tool_tip = "Media URL"
+<combo_box.commit_callback
+function="MediaCtrl.CommitURL" />
+</combo_box>
+	  -->
+	  <line_editor 
+		  name="media_address_url"
+		  follows="left|right" 
+		  height="22"
+		  top="0"
+		  tool_tip="Media URL"
+		  text_pad_right="16"> 
+		<line_editor.commit_callback
+			function="MediaCtrl.CommitURL"/>
+	  </line_editor>
+	  <layout_stack
+		  animate="false"
+		  follows="right"
+		  width="32"
+		  min_width="32"
+		  height="16"
+		  top="3"
+		  orientation="horizontal"
+		  left_pad="-38">
+		<icon
+			name="media_whitelist_flag"
+			follows="top|right"
+			height="16"
+			image_name="smicon_warn.tga"
+			layout="topleft"
+			tool_tip="White List enabled"
+			min_width="16"
+			width="16" />
+		<icon
+			name="media_secure_lock_flag"
+			height="16"
+			image_name="inv_item_eyes.tga"
+			layout="topleft"
+			tool_tip="Secured Browsing"
+			min_width="16"
+			width="16" />
+	  </layout_stack>
+	</layout_panel>
+	<layout_panel
+		name="media_play_position"
+		auto_resize="true"
+		user_resize="false"
+		follows="left|right|top|bottom"
+		layout="topleft"
+		min_width="100"
+		width="200">
+	  <slider_bar
+		  name="media_play_slider"
+		  follows="left|right|top"
+		  height="22"
+		  increment="0.05"
+		  initial_value="0.5"
+		  layout="topleft"
+		  tool_tip="Movie play progress"
+		  min_width="100"
+		  width="200">
+		<slider_bar.commit_callback
+			function="MediaCtrl.JumpProgress" />
+	  </slider_bar>
+	</layout_panel>
+	<layout_panel
+		name="media_volume"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		height="24"
+		min_width="24"
+		width="24">
+	  <button
+		  name="media_volume_button"
+		  height="22"
+		  image_selected="icn_speaker-muted_dark.tga"
+		  image_unselected="icn_speaker_dark.tga"
+		  is_toggle="true"
+		  layout="topleft"
+		  scale_image="false" 
+		  picture_style="true"
+		  tool_tip="Mute This Media"
+		  top_delta="22"
+		  min_width="24"
+		  width="24" >
+		<button.commit_callback
+			function="MediaCtrl.ToggleMute" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="volume_up"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		min_width="20"
+		height="14"
+		width="20">
+	  <button
+		  top="-3"
+		  height="14"
+		  image_selected="media_btn_scrollup.png"
+		  image_unselected="media_btn_scrollup.png"
+		  layout="topleft"
+		  tool_tip="Volume up"
+		  picture_style="true"
+		  scale_image="true"
+		  min_width="20"
+		  width="20" >
+		<button.commit_callback
+			function="MediaCtrl.CommitVolumeUp" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="volume_down"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		min_width="20"
+		height="14"
+		width="20">
+	  <button
+		  top="-5"
+		  height="14"
+		  image_selected="media_btn_scrolldown.png"
+		  image_unselected="media_btn_scrolldown.png"
+		  layout="topleft"
+		  tool_tip="Volume down"
+		  picture_style="true"
+		  scale_image="true"
+		  min_width="20"
+		  width="20">
+		<button.commit_callback
+			function="MediaCtrl.CommitVolumeDown" />
+	  </button>
+	</layout_panel>
+	<!-- Scroll pad -->
+	<layout_panel
+		name="media_panel_scroll"
+		auto_resize="false"
+		user_resize="false"
+		height="32"
+		follows="left|right|top|bottom"
+		layout="topleft"
+		min_width="32"
+		width="32">
+	  <icon
+		  height="32"
+		  image_name="media_panel_scrollbg.png"
+		  layout="topleft"
+		  top="0"
+		  min_width="32"
+		  width="32" />
+	  <button
+		  name="scrollup"
+		  height="8"
+		  image_selected="media_btn_scrollup.png"
+		  image_unselected="media_btn_scrollup.png"
+		  layout="topleft"
+		  tool_tip="Scroll up"
+		  picture_style="true"
+		  scale_image="false"
+		  left="12"
+		  top_delta="4"
+		  min_width="8"
+		  width="8" />
+	  <button
+		  name="scrollleft"
+		  height="8"
+		  image_selected="media_btn_scrollleft.png"
+		  image_unselected="media_btn_scrollleft.png"
+		  layout="topleft"
+		  left="3"
+		  tool_tip="Scroll left"
+		  picture_style="true"
+		  scale_image="false"
+		  top="12"
+		  min_width="8"
+		  width="8" />
+	  <button
+		  name="scrollright"
+		  height="8"
+		  image_selected="media_btn_scrollright.png"
+		  image_unselected="media_btn_scrollright.png"
+		  layout="topleft"
+		  left_pad="9"
+		  tool_tip="Scroll right"
+		  picture_style="true"
+		  scale_image="false"
+		  top_delta="0"
+		  min_width="8"
+		  width="8" />
+	  <button
+		  name="scrolldown"
+		  height="8"
+		  image_selected="media_btn_scrolldown.png"
+		  image_unselected="media_btn_scrolldown.png"
+		  layout="topleft"
+		  left="12"
+		  tool_tip="Scroll down"
+		  picture_style="true"
+		  scale_image="false"
+		  top="20"
+		  min_width="8"
+		  width="8" />
+	</layout_panel>
+	<layout_panel
+		name="zoom_frame"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		height="28"
+		min_width="22"
+		width="22">
+	  <button
+		  height="22"
+		  image_selected="media_btn_optimalzoom.png"
+		  image_unselected="media_btn_optimalzoom.png"
+		  layout="topleft"
+		  tool_tip="Zoom"
+		  picture_style="true"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Zoom" />
+	  </button>
+	</layout_panel>
+<!--
+	<panel
+		height="22"
+		layout="topleft"
+		auto_resize="false"
+		min_width="3"
+		width="3">
+	  <icon
+		  height="22"
+		  image_name="media_panel_divider.png"
+		  layout="topleft"
+		  top="0"
+		  min_width="3"
+		  width="3" />
+	</panel>
+-->
+	<layout_panel
+		name="new_window"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		min_width="22"
+		width="22">
+	  <button
+		  height="22"
+		  image_selected="media_btn_newwindow.png"
+		  image_unselected="media_btn_newwindow.png"
+		  layout="topleft"
+		  tool_tip = "Open URL in browser"
+		  picture_style="true"
+		  top_delta="-3"
+		  min_width="24"
+		  width="24" >
+		<button.commit_callback
+			function="MediaCtrl.Open" />
+	  </button>
+	</layout_panel>
+<!--
+	<panel
+		height="22"
+		layout="topleft"
+		auto_resize="false"
+		min_width="3"
+		width="3">
+	  <icon
+		  height="22"
+		  image_name="media_panel_divider.png"
+		  layout="topleft"
+		  top="0"
+		  min_width="3"
+		  width="3" />
+	</panel>
+-->
+	<layout_panel
+		name="close"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		min_width="21"
+		width="21" >
+	  <button
+		  height="22"
+		  image_selected="media_btn_done.png"
+		  image_unselected="media_btn_done.png"
+		  layout="topleft"
+		  tool_tip ="Close media control"
+		  picture_style="true"
+		  top_delta="-4"
+		  width="21" >
+		<button.commit_callback
+			function="MediaCtrl.Close" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		width="0"
+		layout="topleft"
+		user_resize="false" />
+  </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 81bc12c33c..4eacd72a7d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -61,9 +61,7 @@
 	<string name="TooltipFlagGroupScripts">Group Scripts</string>
 	<string name="TooltipFlagNoScripts">No Scripts</string>
 	<string name="TooltipLand">Land:</string>
-	<string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>	
-	<string name="TooltipAltLeft">Alt+&#8592; for previous tab</string>	
-	<string name="TooltipAltRight">Alt+&#8594; for next tab</string>	
+	<string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>
 
 	<!-- tooltips for Urls -->
 	<string name="TooltipHttpUrl">Click to view this web page</string>
@@ -264,10 +262,6 @@
 	<string name="TrackYourCamera">Track your camera</string>
 	<string name="ControlYourCamera">Control your camera</string>
 
-	<!-- IM -->
-	<string name="IM_logging_string">-- Instant message logging enabled --</string>
-	<string name="Unnamed">(Unnamed)</string>
-	
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">PG</string>
 	<string name="SIM_ACCESS_MATURE">Mature</string>
@@ -2022,15 +2016,14 @@ this texture in your inventory
 	<string name="IMTeen">teen</string>
 	
 	<!-- floater region info -->
+	<!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
 	<string name="RegionInfoError">error</string>
 	<string name="RegionInfoAllEstatesOwnedBy">
-		all estates
-owned by [OWNER]
+		all estates owned by [OWNER]
 	</string>
-	<string name="RegionInfoAllEstatesYouOwn">all estates you owned</string>
+	<string name="RegionInfoAllEstatesYouOwn">all estates that you own</string>
 	<string name="RegionInfoAllEstatesYouManage">
-		all estates that
-you managed for [OWNER]
+		all estates that you manage for [OWNER]
 	</string>
 	<string name="RegionInfoAllowedResidents">Allowed residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
 	<string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
@@ -2884,7 +2877,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	  Failed to start viewer
 	</string>
 
-  <!-- IM system messages -->
+	<!-- IM system messages -->
+	<string name="IM_logging_string">-- Instant message logging enabled --</string>
+	<string name="IM_typing_start_string">[NAME] is typing...</string>
+	<string name="Unnamed">(Unnamed)</string>
+	<string name="IM_moderated_chat_label">(Moderated: Voices off by default)</string>
+	<string name="IM_unavailable_text_label">Text chat is not available for this call.</string>
+
+
   <string name="ringing-im">
     Joining Voice Chat...
   </string>
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index b72d59524e..ea6997ebd5 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -4,8 +4,8 @@
     message_separator="panel_chat_separator.xml"
     left_text_pad="10"
 	right_text_pad="15"
-    left_widget_pad="5"
-	rigth_widget_pad="10"
+    left_widget_pad="0"
+	right_widget_pad="10"
 	max_length="2147483647"
 	enabled="false"
 	track_bottom="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
index 89e442baec..ab4ad94089 100644
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
@@ -23,7 +23,8 @@
                               image_selected="DropDown_Selected"
                               image_disabled="DropDown_Disabled"
                               image_disabled_selected="DropDown_Disabled_Selected" />
-  <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" />
+  <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
+                                scroll_bar_bg_visible="true" />
   <gesture_combo_box.combo_editor name="Combo Text Entry"
                           select_on_focus="true"
                           font="SansSerifSmall" />
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 2fe5f517a2..7d10df1af7 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <tab_container tab_min_width="60"
                tab_max_width="150"
+               font_halign="left"
                tab_height="16">
   <first_tab tab_top_image_unselected="TabTop_Left_Off"
                tab_top_image_selected="TabTop_Left_Selected"