Merge from viewer2 trunk again - some fairly important fixes there.

14 files changed, 510 insertions, 315 deletions

diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index 90105f92fd..dcf9847adb 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -23,8 +23,6 @@
  pad_left="11"
  pad_right="7"
  tab_stop="false"
- pad_right="10"
- pad_left="10" 
  top="0"
  use_ellipses="true"
  width="140" />
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 57e92cdeec..243b63db00 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -14,8 +14,8 @@
  visible="true"
  width="360"
  can_resize="true"
- min_width="360"
- min_height="350">
+ min_width="250"
+ min_height="190">
   <layout_stack
   follows="all"
   height="320"
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 1fa613468f..a4ef807f06 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -30,7 +30,7 @@
     </string>
     <string
      name="no_one_near">
-        No one near
+        No one near has voice enabled
     </string>
     <string
      name="max_visible_items">
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 2f2964c42b..a666b8a427 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -65,7 +65,7 @@
     <slider
      follows="top|left"
      height="23"
-     increment="0.05"
+     increment="0.01"
      left="1"
      max_val="0.95"
      min_val="0.05"
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 01df208850..dde92f23b6 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -30,6 +30,8 @@
    label="Call"
    enabled="true"
    name="call">
+    <menu_item_call.on_click
+     function="InspectAvatar.Call"/>
   </menu_item_call>
   <menu_item_call
    label="Teleport"
diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
index 3065239615..f3b207e36c 100644
--- a/indra/newview/skins/default/xui/en/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
@@ -11,6 +11,9 @@
         <menu_item_call.on_click 
          function="Picks.Plus.Action" 
          userdata="new_pick" />
+        <menu_item_call.on_enable
+         function="Picks.Plus.Enable"
+         userdata="new_pick" />
         </menu_item_call>
     <menu_item_call 
      name="create_classified" 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 59a55d3da2..5e0ea8d650 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5087,6 +5087,14 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
 
   <notification
    icon="notify.tga"
+   name="TeleportOfferSent"
+   type="offer">
+	Teleport offer sent to [TO_NAME]
+  </notification>
+
+
+  <notification
+   icon="notify.tga"
    name="GotoURL"
    type="notify">
 [MESSAGE]
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
index f3a2297151..6c54532a3a 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -5,56 +5,94 @@
  height="215"
  name="panel_im_control_panel"
  width="180">
-    <avatar_list
-     color="DkGray2"
+    <layout_stack
+     mouse_opaque="false"
+     border_size="0"
+     clip="false"
      follows="all"
-     height="130"
-     ignore_online_status="true"
+     height="215"
      layout="topleft"
      left="3"
-     name="speakers_list"
-     opaque="false"
-     show_info_btn="false"
-     show_profile_btn="false"
-     show_speaking_indicator="false"
-     top="10"
-     width="180" />
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     border="false"
-     bottom="1"
-     follows="left|right|bottom"
-     height="70"
-     left="0"
-     left_pad="0"
-     name="panel_call_buttons"
-     top_pad="0"
-     width="180">
-        <button
-         bottom="10"
-         follows="all"
-         height="20"
-         label="Call"
-         left_delta="10"
-         name="call_btn"
-         width="160" />
-        <button
-         bottom="40"
-         follows="all"
-         height="20"
-         label="Leave Call"
-         name="end_call_btn"
-         visible="false"
-          />
-        <button
-         follows="all"
-         bottom="10"
-         height="20"
-         label="Voice Controls"
-         name="voice_ctrls_btn"
-         use_ellipses="true" 
-         visible="false"
-          />
-    </panel>
+     name="vertical_stack"
+     orientation="vertical"
+     top="0"
+     width="177">
+        <layout_panel
+         auto_resize="true"
+         follows="top|left"
+         height="130"
+         layout="topleft"
+         min_height="0"
+         mouse_opaque="false"
+         width="180"
+         top="0"
+         name="speakers_list_panel"
+         user_resize="false">
+            <avatar_list
+             color="DkGray2"
+             follows="all"
+             height="130"
+             ignore_online_status="true"
+             layout="topleft"
+             name="speakers_list"
+             opaque="false"
+             show_info_btn="false"
+             show_profile_btn="false"
+             show_speaking_indicator="false"
+             width="180" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="160"
+         name="call_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="20"
+             label="Call"
+             name="call_btn"
+             width="160"
+             top="5" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="160"
+         name="end_call_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="20"
+             label="Leave Call"
+             name="end_call_btn"
+             top="5"/>
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="160"
+         name="voice_ctrls_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="20"
+             label="Voice Controls"
+             name="voice_ctrls_btn"
+             top="5"
+             use_ellipses="true" />
+        </layout_panel>
+    </layout_stack>
 </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 86b30ebfce..4073ef158b 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
@@ -5,66 +5,110 @@
  height="238"
  name="panel_im_control_panel"
  width="180">
-    <avatar_list
-     color="DkGray2"
+    <layout_stack
+     mouse_opaque="false"
+     border_size="0"
+     clip="false"
      follows="all"
-     height="100"
-     ignore_online_status="true"
+     height="238"
      layout="topleft"
-     left="3"
-     name="speakers_list"
-     opaque="false"
-     show_info_btn="false"
-     show_profile_btn="false"
-     show_speaking_indicator="false"
-     top="10"
-     width="180" />
-    <button
-     bottom_pad="0"
-     follows="left|right|bottom"
-     height="23"
-     label="Group Profile"
-     left_delta="10"
-     name="group_info_btn"
-     use_ellipses="true" 
-     width="160" />
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     border="false"
-     follows="left|right|bottom"
-     height="70"
-     left="0"
-     left_pad="0"
-     name="panel_call_buttons"
-     top_pad="0"
-     width="180">
-        <button
-         bottom="10"
-         follows="all"
-         height="23"
-         label="Call Group"
-         left_delta="10"
-         name="call_btn"
-         use_ellipses="true" 
-         width="160" />
-        <button
-         bottom="40"
-         follows="all"
-         height="23"
-         label="Leave Call"
-         name="end_call_btn"
-         use_ellipses="true" 
-         visible="false"
-          />
-        <button
-         bottom="10"
-         follows="all"
-         height="23"
-         label="Open Voice Controls"
-         name="voice_ctrls_btn"
-         use_ellipses="true" 
-         visible="false"
-          />
-    </panel>
+     left="5"
+     name="vertical_stack"
+     orientation="vertical"
+     top="0"
+     width="175">
+        <layout_panel
+         auto_resize="true"
+         follows="top|left"
+         height="100"
+         layout="topleft"
+         min_height="0"
+         mouse_opaque="false"
+         width="180"
+         top="0"
+         name="speakers_list_panel"
+         user_resize="false">
+            <avatar_list
+             color="DkGray2"
+             follows="all"
+             height="100"
+             ignore_online_status="true"
+             layout="topleft"
+             name="speakers_list"
+             opaque="false"
+             show_info_btn="false"
+             show_profile_btn="false"
+             show_speaking_indicator="false"
+             width="180" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="160"
+         name="group_info_btn_panel"
+         user_resize="false">
+            <button
+             follows="left|right|bottom"
+             height="23"
+             label="Group Profile"
+             name="group_info_btn"
+             use_ellipses="true"
+             top="5"
+             width="160" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="160"
+         name="call_btn_panel"
+         user_resize="false">
+            <button
+             follows="all"
+             height="23"
+             label="Call Group"
+             name="call_btn"
+             use_ellipses="true" 
+             width="160" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="160"
+         name="end_call_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="23"
+             label="Leave Call"
+             name="end_call_btn"
+             use_ellipses="true" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="160"
+         name="voice_ctrls_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="23"
+             label="Open Voice Controls"
+             name="voice_ctrls_btn"
+             use_ellipses="true" />
+        </layout_panel>
+    </layout_stack>
 </panel>
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 30e652befd..2e3d5a7320 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
@@ -6,84 +6,161 @@
  width="110">
     <avatar_icon
      follows="left|top"
-     height="100"
+     height="105"
      left_delta="5"
      name="avatar_icon"
      top="-5"
-     width="100"/>
+     width="105"/>
     <text
      follows="top|left|right"
      font="SansSerifLarge"
-     height="22"
+     height="19"
      layout="topleft"
      name="avatar_name"
      use_ellipses="true"
      value="Unknown"
-     width="100" />
-    <button
-     follows="left|top|right"
-     height="20"
-     label="Profile"
-     name="view_profile_btn"
-     width="100" />
-    <button
-     follows="left|top|right"
-     height="20"
-     label="Add Friend"
-     name="add_friend_btn"
-     width="100" />
-    <button
-     follows="left|top|right"
-     height="20"
-     label="Teleport"
-     name="teleport_btn"
-     width="100" />
-   <button
-     follows="left|top|right"
-     height="20"
-     label="Share"
-     name="share_btn"
-     width="100" />
-     <!--Removing pay button to save space - will update spec - verified by Erica/Steve -->
- <!--   <button
-     follows="left|top|right"
-     height="20"
-     label="Pay"
-     name="pay_btn"
-     width="100" />-->
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     border="false"
-     top_pad="10"
-     follows="left|bottom|right"
-     height="70"
-     left="1"
-     name="panel_call_buttons"
-     width="109">
-        <button
-         bottom="10"
-         follows="left|top|right"
-         height="20"
-         label="Call"
-         left_delta="5"
-         name="call_btn"
-         width="100" />
-        <button
-         bottom="35"
-         follows="left|top|right"
+     width="110" />
+    <layout_stack
+     mouse_opaque="false"
+     border_size="0"
+     clip="false"
+     follows="all"
+     height="168"
+     layout="topleft"
+     left="5"
+     name="button_stack"
+     orientation="vertical"
+     top_pad="0"
+     width="105">
+        <layout_panel
+         mouse_opaque="false"
+         auto_resize="true"
+         follows="top|left"
+         height="0"
+         layout="topleft"
+         left="2"
+         min_height="0"
+         width="100"
+         top="0"
+         name="spacer"
+         user_resize="false" />
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
          height="20"
-         label="Leave Call"
-         name="end_call_btn"
-         visible="false"
-         width="100" />
+         layout="topleft"
+         min_height="20"
+         width="100"
+         name="view_profile_btn_panel"
+         user_resize="false">
+            <button
+             follows="left|top|right"
+             height="20"
+             label="Profile"
+             name="view_profile_btn"
+             top="0"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="add_friend_btn_panel"
+         user_resize="false">
+            <button
+             follows="left|top|right"
+             height="20"
+             label="Add Friend"
+             name="add_friend_btn"
+             top="5"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="teleport_btn_panel"
+         user_resize="false">
         <button
-         bottom="10"
-         follows="left|top|right"
-         height="20"
-         label="Voice Controls"
-         name="voice_ctrls_btn"
-         visible="false"
-         width="100" />
-    </panel>
+             auto_resize="false"
+             follows="left|top|right"
+             height="20"
+             label="Teleport"
+             name="teleport_btn"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="share_btn_panel"
+         user_resize="false">
+           <button
+             auto_resize="true"
+             follows="left|top|right"
+             height="20"
+             label="Share"
+             name="share_btn"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="call_btn_panel"
+         user_resize="false">
+            <button
+             follows="left|top|right"
+             height="20"
+             label="Call"
+             name="call_btn"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="end_call_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="left|top|right"
+             height="20"
+             label="Leave Call"
+             name="end_call_btn"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="voice_ctrls_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="left|top|right"
+             height="20"
+             label="Voice Controls"
+             name="voice_ctrls_btn"
+             width="100" />
+        </layout_panel>
+    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index ccd754ac5e..7204e57479 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -21,6 +21,7 @@
      label="im_header"
      layout="topleft"
      left="5"
+     mouse_opaque="false"
      name="im_header"
      top="5"
      width="295">
@@ -30,7 +31,7 @@
          image_name="Generic_Person"
          layout="topleft"
          left="3"
-         mouse_opaque="true"
+         mouse_opaque="false"
          name="avatar_icon"
          top="3"
          width="18" />
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index d6d8e9562b..7e512f9594 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -21,19 +21,6 @@
      tab_position="top"
      halign="center"
      width="313">
-      <inventory_panel
-        label="MY OUTFITS"
-        help_topic="my_outfits_tab"
-	    allow_multi_select="true"
-	    follows="all"
-	    border="false"
-	    left="0"
-        top="0"
-        height="500"
-        width="290"
- 		mouse_opaque="true"
- 	    name="outfitslist_accordionpanel"
- 		start_folder="My Outfits" /> 
          <inventory_panel
         label="WEARING"
         help_topic="now_wearing_tab"
@@ -46,6 +33,19 @@
         mouse_opaque="true"
         name="cof_accordionpanel"
         start_folder="Current Outfit" />
+         <inventory_panel
+           label="MY OUTFITS"
+           help_topic="my_outfits_tab"
+           allow_multi_select="true"
+           follows="all"
+           border="false"
+           left="0"
+           top="0"
+           height="500"
+           width="290"
+           mouse_opaque="true"
+           name="outfitslist_accordionpanel"
+           start_folder="My Outfits" /> 
    </tab_container>
 	<panel
 	  background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
index 7b88fca7c3..2c7a51f0e7 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
@@ -18,17 +18,6 @@
 		 parameter="wear" />
     </menu_item_call>
     <menu_item_call
-     label="Add To Current Outfit"
-     layout="topleft"
-     name="add">
-        <on_click
-         function="panel_outfits_inventory_gear_default.Custom.Action"
-         parameter="add" />
-        <on_enable
-		 function="panel_outfits_inventory_gear_default.Enable"
-		 parameter="add" />
-    </menu_item_call>
-    <menu_item_call
      label="Remove From Current Outfit"
      layout="topleft"
      name="remove">
@@ -54,7 +43,7 @@
 		 parameter="rename" />
     </menu_item_call>
     <menu_item_call
-     label="Remove"
+     label="Remove Link"
      layout="topleft"
      name="remove_link">
         <on_click
@@ -65,7 +54,7 @@
 		 parameter="remove_link" />
     </menu_item_call>
     <menu_item_call
-     label="Delete"
+     label="Delete Outfit"
      layout="topleft"
      name="delete">
         <on_click
@@ -73,6 +62,6 @@
          parameter="delete" />
         <on_enable
 		 function="panel_outfits_inventory_gear_default.Enable"
-		 parameter="delete" />
+		 parameter="delete_outfit" />
     </menu_item_call>
 </menu>
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
index 677d0de243..4cef1f9c60 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -1,54 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
 	follows="left|right|top|bottom"
-	name="MediaControls"
+	name="MediaControlsPanel"
 	background_visible="false"
 	height="200"
 	layout="topleft"
 	help_topic="prim_media_controls"
 	mouse_opaque="false"
+	min_width="300"
 	width="800">
   <string name="control_background_image_name">Inspector_Background</string>
   <string name="skip_step">0.2</string>
-  <string name="min_width">400</string>
-  <string name="min_height">120</string>
+  <string name="min_width">300</string>
+  <string name="min_height">75</string>
   <string name="zoom_near_padding">1.0</string>
   <string name="zoom_medium_padding">1.25</string>
   <string name="zoom_far_padding">1.5</string>
-  <panel
-	  name="media_region"
-	  height="100"
-	  follows="left|right|top|bottom"
+  <string name="top_world_view_avoid_zone">50</string>
+  <layout_stack
+	  name="progress_indicator_area"
+	  follows="left|right|top"
+	  height="8"
 	  layout="topleft"
-	  mouse_opaque="false"
-	  top="0" />
+	  animate="false"
+	  left="0"
+	  orientation="horizontal"
+	  top="22">
+	<!-- outer layout_panels center the inner one -->
+	<layout_panel
+		width="0"
+		name="left_bookend_bottom"
+		mouse_opaque="false"
+		layout="topleft"
+		user_resize="false" />
+	<panel
+		name="media_progress_indicator"
+		mouse_opaque="false"
+		follows="left|right|top"
+		height="8"
+		layout="topleft"
+		left="0"
+		top="0"
+		auto_resize="false"
+		user_resize="false"
+		min_width="100"
+		width="200">
+	  <progress_bar
+		  name="media_progress_bar"
+		  color_bg="1 1 1 1"
+		  color_bar="1 1 1 0.96"
+		  follows="left|right|top"
+		  height="8"
+		  layout="topleft"
+		  top="0"
+		  left="0"
+		  tool_tip="Media is Loading"/>
+	</panel>
+	<layout_panel
+		name="right_bookend_bottom"
+		width="0"
+		mouse_opaque="false"
+		layout="topleft"
+		user_resize="false" />
+  </layout_stack>
   <layout_stack
 	  name="media_controls"
-	  follows="left|right"
+	  follows="left|right|top"
 	  animate="false"
 	  height="75"
 	  layout="topleft"
+	  top="0"
 	  left="0"
+	  border_size="1"
 	  mouse_opaque="false"
-	  orientation="horizontal"
-	  top="100">
+	  orientation="horizontal">
 	<!-- outer layout_panels center the inner one -->
 	<layout_panel
 		name="left_bookend"
+		top="0"
 		width="0"
-	  mouse_opaque="false"
+		mouse_opaque="false"
 		layout="topleft"
 		user_resize="false" />
 	<layout_panel
 		name="back"
+		top="0"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-	  mouse_opaque="false"
+		mouse_opaque="false"
 		min_width="22"
-		width="22"
-		top="4">
+		width="22">
 	  <button
+		  name="back_btn"
+		  follows="top"
 		  image_overlay="Arrow_Left_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -56,12 +101,12 @@
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
 		  auto_resize="false"
-		  height="22"
 		  layout="topleft"
 		  tool_tip="Navigate back"
-		  width="22"
+		  top="0"
 		  left="0"
-		  top_delta="4">
+		  width="22"
+		  height="22">
 		<button.commit_callback
 			function="MediaCtrl.Back" />
 	  </button>
@@ -71,22 +116,24 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="10"
 		min_width="22"
+		top="0"
+		height="22"
 		width="22">
 	  <button
+		  follows="top"
 		  image_overlay="Arrow_Right_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_selected="PushButton_Selected"
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
+		  top="0"
 		  height="22"
-		  layout="topleft"
-		  tool_tip="Navigate forward"
-		  top_delta="0"
 		  min_width="22"
-		  width="22">
+		  width="22"
+		  layout="topleft"
+		  tool_tip="Navigate forward">
 		<button.commit_callback
 			function="MediaCtrl.Forward" />
 	  </button>
@@ -96,10 +143,12 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="-2"
+		top="0"
+		height="22"
 		min_width="22"
 		width="22">
 	  <button
+		  follows="top"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_overlay="Home_Off"
@@ -108,6 +157,7 @@
 		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip="Home page"
+		  top="0"
 		  height="22"
 		  min_width="22"
 		  width="22">
@@ -120,19 +170,22 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="2"
+		top="0"
+		height="22"
 		min_width="22"
 		width="22">
 	  <button
+		  follows="top"
 		  image_overlay="Stop_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_selected="PushButton_Selected"
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
-		  height="22"
 		  layout="topleft"
 		  tool_tip="Stop media"
+		  top="0"
+		  height="22"
 		  min_width="22"
 		  width="22">
 		<button.commit_callback
@@ -144,11 +197,12 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="6"
+		top="0"
+		height="22"
 		min_width="22"
 		width="22">
 	  <button
-		  height="22"
+		  follows="top"
 		  image_overlay="Refresh_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -157,6 +211,8 @@
 		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip="Reload"
+		  top="0"
+		  height="22"
 		  min_width="22"
 		  width="22">
 		<button.commit_callback
@@ -168,11 +224,12 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="10"
+		top="0"
+		height="22"
 		min_width="22"
 		width="22">
 	  <button
-		  height="22"
+		  follows="top"
 		  image_overlay="StopReload_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -181,6 +238,8 @@
 		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip = "Stop loading"
+		  top="0"
+		  height="22"
 		  min_width="22"
 		  width="22">
 		<button.commit_callback
@@ -192,10 +251,12 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="14"
+		top="0"
+		height="22"
 		min_width="22"
 		width="24">
 	  <button
+		  follows="top"
 		  image_overlay="Play_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -205,7 +266,7 @@
 		  layout="topleft"
 		  tool_tip = "Play media"
 		  left_delta="2"
-		  top="4"
+		  top="0"
 		  height="22"
 		  min_width="22"
 		  width="22">
@@ -218,10 +279,11 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="18"
+		top="0"
 		min_width="22"
 		width="24">
 	  <button
+		  follows="top"
 		  image_overlay="Pause_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -229,10 +291,10 @@
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
 		  layout="topleft"
+		  top="0"
 		  height="22"
 		  width="22"
 		  left_delta="-1"
-		  top="4"
 		  tool_tip = "Pause media">
 		<button.commit_callback
 			function="MediaCtrl.Pause" />
@@ -246,11 +308,12 @@
 		height="24"
 		follows="left|right|bottom"
 		layout="topleft"
+		top="0"
 		width="190"
 		min_width="90">
 	  <line_editor 
 		  name="media_address_url"
-		  follows="left|right" 
+		  follows="top|left|right" 
 		  height="22"
 		  top="0"
 		  tool_tip="Media URL"
@@ -261,17 +324,18 @@
 	  <layout_stack
 		  name="media_address_url_icons"
 		  animate="false"
-		  follows="right"
+		  follows="top|right"
 		  height="20"
 		  width="38"
-		  right="-2"
-		  top="-1"
-     	mouse_opaque="false"
+		  top="0"
+		  right="-1"
+		  border_size="0"
+		  mouse_opaque="false"
 		  orientation="horizontal">
 		<layout_panel
 			layout="topleft"
 			width="16"
-     	mouse_opaque="false"
+			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false">
 		  <icon
@@ -287,7 +351,7 @@
 		<layout_panel
 			layout="topleft"
 			width="16"
-     	mouse_opaque="false"
+			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false">
 		  <icon
@@ -305,16 +369,17 @@
 		name="media_play_position"
 		auto_resize="true"
 		user_resize="false"
-		follows="left|right|top|bottom"
+		follows="left|right"
 		layout="topleft"
-		height="16"		
+		top="0"
+		height="22"
 		min_width="100"
 		width="200">
 	  <slider_bar
 		  name="media_play_slider"
 		  follows="left|right|top"
-		  height="20"
-		  bottom="88"
+		  top="0"
+		  height="22"
 		  increment="0.01"
 		  initial_value="0.5"
 		  layout="topleft"
@@ -330,9 +395,11 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+		top="0"
 		min_width="22"
 		width="22">
 	  <button
+		  follows="top"
 		  image_overlay="SkipBackward_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -343,7 +410,7 @@
 		  height="22"
 		  layout="topleft"
 		  tool_tip="Step back"
-		  top="-14"
+		  top="0"
 		  width="22"
 		  left="0">
 		<button.commit_callback
@@ -355,9 +422,11 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+		top="0"
 		min_width="22"
 		width="22">
 	  <button
+		  follows="top"
 		  image_overlay="SkipForward_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -367,7 +436,7 @@
 		  height="22"
 		  layout="topleft"
 		  tool_tip="Step forward"
-		  top="-14"
+		  top="0"
 		  min_width="22"
 		  width="22">
 		<button.commit_callback
@@ -379,26 +448,28 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="-50"
+		top="0"
 		height="72"
 		min_width="22"
 		width="22">
 	  <!-- Note: this is not quite right either...the mute button is not the -->
 	  <!-- same as the others because it cannot have the "image_overlay" be  -->
 	  <!-- two different images.  -->
+	  <!-- Note also: the button and the slider must overlap! -->
 	  <button
+		  follows="top"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_selected="AudioMute_Off"
 		  image_unselected="Audio_Off"
 		  hover_glow_amount="0.15"
 		  name="media_mute_button"
-		  height="22"
 		  is_toggle="true"
 		  layout="topleft"
 		  scale_image="false" 
 		  tool_tip="Mute This Media"
-		  top="118"
+		  top="0"
+		  height="20"
 		  min_width="22"
 		  width="22" >
 		<button.commit_callback
@@ -411,7 +482,7 @@
 	  <slider
 		  orientation="vertical"
 		  left="0"
-		  top="-2"
+		  top="16"
 		  height="50"
 		  layout="topleft"
 		  increment="0.01"
@@ -428,35 +499,24 @@
 			function="MediaCtrl.HideVolumeSlider" />
 	  </slider>
 	</layout_panel>
-	<panel
-		height="28"
-		layout="topleft"
-		auto_resize="false"
-		min_width="3"
-		width="3">
-	  <icon
-		  height="26"
-		  image_name="media_panel_divider.png"
-		  layout="topleft"
-		  top="0"
-		  min_width="3"
-		  width="3" />
-	</panel>
 	<layout_panel
 		name="zoom_frame"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+		top="0"
 		height="28"
 		min_width="22"
 		width="22">
 	  <button
+		  follows="top"
 		  image_overlay="Zoom_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_selected="PushButton_Selected"
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
+		  top="0"
 		  height="22"
 		  layout="topleft"
 		  tool_tip="Zoom into media"
@@ -471,15 +531,18 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+		top="0"
 		min_width="21"
 		width="21" >
 	  <button
+		  follows="top"
 		  image_overlay="UnZoom_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_selected="PushButton_Selected"
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
+		  top="0"
 		  height="22"
 		  layout="topleft"
 		  tool_tip ="Zoom Back"
@@ -494,9 +557,11 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+		top="0"
 		min_width="22"
 		width="22">
 	  <button
+		  follows="top"
 		  image_overlay="ExternalBrowser_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -506,7 +571,7 @@
 		  height="22"
 		  layout="topleft"
 		  tool_tip = "Open URL in browser"
-		  top_delta="-4"
+		  top="0"
 		  min_width="24"
 		  width="24" >
 		<button.commit_callback
@@ -516,46 +581,16 @@
 	<!-- bookend panel -->
 	<layout_panel
 		name="right_bookend"
-		width="0"
-		layout="topleft"
-		user_resize="false" />
-  </layout_stack>
-  <layout_stack
-	  follows="left|right|bottom"
-	  height="20"
-	  layout="topleft"
-	  animate="false"
-	  left="0"
-	  orientation="horizontal"
-	  top="170">
-	<!-- outer layout_panels center the inner one -->
-	<layout_panel
-		width="0"
-		layout="topleft"
-		user_resize="false" />
-	<panel
-		name="media_progress_indicator"
-		height="20"
-		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"
-		  top="5"
-		  height="8"
-		  layout="topleft"
-		  left="0"
-		  tool_tip="Media is Loading"/>
-	</panel>
-	<layout_panel
 		width="0"
 		layout="topleft"
 		user_resize="false" />
   </layout_stack>
+  <panel
+	  name="media_region"
+	  height="100"
+	  follows="left|right|top|bottom"
+	  layout="topleft"
+	  mouse_opaque="false"
+	  top="30" />
 </panel>