merge

--HG--
branch : product-engine

25 files changed, 826 insertions, 1119 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index 3f86080160..6ecdd76573 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -1,36 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="400"
+ legacy_header_height="18"
+ can_minimize="false"
+ can_tear_off="false"
+ can_resize="true"
+ can_drag_on_left="false"
+ can_close="true"
+ can_dock="true"
+ bevel_style="in"
+ height="300"
  layout="topleft"
- name="floater_aaa"
- can_resize="true" 
- width="500">
-  <string name="bump_parabuild">1</string>
-  <text
- bottom="390"
- left="10"
- name="right_aligned_text"
- width="300"
- halign="right"
- top_pad="10">
-    Right aligned text
-  </text>
-  <text
- bottom="390"
- left="10"
- name="centered_text"
- width="300"
- halign="center"
- top_pad="10">
-    Centered text
-  </text>
-  <text
- left="10"
- name="left_aligned_text"
- width="300"
- halign="left"
- top_pad="10">
-    Left aligned text
-  </text>
-
+ name="Test Floater"
+ save_rect="true"
+ title="TEST FLOATER"
+ save_dock_state="true"
+ save_visibility="true"
+ single_instance="true"
+ width="320">
+  <chat_history
+   allow_html="true"
+   bg_readonly_color="ChatHistoryBgColor"
+   bg_writeable_color="ChatHistoryBgColor"
+   border_visible="false" 
+   follows="all"
+   font="SansSerif" 
+	    left="1"
+   top="20"
+   layout="topleft"
+	    height="260"
+   name="chat_history"
+   parse_highlights="true"
+   text_color="ChatHistoryTextColor"
+   text_readonly_color="ChatHistoryTextColor"
+   width="320">
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+  </chat_history>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index f50ff01230..55a6179afb 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -43,6 +43,7 @@
              left="0"
              name="browser"
              top="0"
+             start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E"
              width="570" />
             <button
              follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index d9498586af..d363452204 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -47,6 +47,7 @@
              left="0"
              name="browser"
              top="0"
+             start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E"
              width="570" />
             <text
              follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index be6d63716c..4e9388c2b2 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -6,19 +6,20 @@
  top="0" 
  follows="right|bottom"
  layout="topleft"
- name="notification_chiclet"
+ name="sys_well_window"
  help_topic="notification_chiclet"
  save_rect="true"
  title="NOTIFICATIONS" 
  width="320"
  min_width="320"
  height="23"
- can_minimize="true"
+ can_minimize="false"
  can_tear_off="false"
  can_resize="true"
  can_drag_on_left="false"
- can_close="false"
  can_dock="true"
+ save_visibility="true"
+ single_instance="true"
 >
     <flat_list_view
 	    color="FloaterDefaultBackgroundColor"
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 310ad13dac..033070607b 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -174,6 +174,53 @@ scroll bar
  word_wrap="true">
 Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
   </text_editor>
+    <text_editor
+ height="50"
+ follows="top|left|bottom"
+ font="Monospace"
+ left_delta="0"
+ name="monospace_text_editor"
+ tool_tip="text editor"
+ top_pad="10"
+ width="200">
+Text Editor
+with multiple
+lines of text
+and hence a
+scroll bar gjyrrr
+  </text_editor>
+    <text_editor
+      border_visible="true"
+      height="50"
+      follows="top|left|bottom"
+      font="Monospace"
+ left_delta="0"
+ name="monospace_text_editor"
+ tool_tip="text editor"
+ top_pad="10"
+ width="200">
+Text Editor
+with multiple
+lines of text
+and hence a
+scroll bar gjyrrr
+  </text_editor>
+    <text_editor
+ height="50"
+ follows="top|left|bottom"
+ font="SansSerif"
+ left_delta="0"
+ name="sansserif_text_editor"
+ tool_tip="text editor"
+ top_pad="10"
+ width="200">
+Text Editor
+with multiple
+lines of text
+and hence a
+scroll bar gjyrrr
+  </text_editor>
+
   <text
    height="40"
    follows="top|left|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index a9b4c1b938..e3851de8e7 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2746,6 +2746,7 @@ even though the user gets a free copy.
 			 left="10"
 			 name="button align"
 			 top_pad="5"
+			 tool_tip="Align media texture (must load first)"
 			 width="100" />
 		</panel>
 	   </panel>
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index e3db0972ec..c0eca91a46 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -4,7 +4,7 @@
  can_resize="true"
  center_horiz="true"
  center_vert="true"
- height="600"
+ height="535"
  layout="topleft"
  min_height="520"
  min_width="520"
@@ -17,388 +17,493 @@
  width="800">
     <panel
      filename="panel_world_map.xml"
-     follows="left|top|right|bottom"
-     height="565"
+     follows="all"
+     height="500"
      layout="topleft"
-     left="15"
+     left="10"
      name="objects_mapview"
      top="25"
      width="542" />
-    <icon
-     follows="top|right"
-     height="16"
-     image_name="map_avatar_16.tga"
-     layout="topleft"
-     left="-230"
-     mouse_opaque="true"
-     name="self"
-     top="34"
-     width="16" />
+     <panel
+     name="layout_panel_1"
+     height="22"
+     width="238"
+     follows="right|top"
+     top="25"
+     left_pad="5"
+  background_visible="true"
+  bg_alpha_color="DkGray2">
     <text
+     text_color="White"
+     font="SansSerifLarge"
      type="string"
      length="1"
      follows="top|right"
+     halign="left"
      height="16"
      layout="topleft"
-     left_pad="4"
-     name="you_label"
-     top_delta="0"
-     width="145">
-        You
+     left="15"
+     name="events_label"
+     top="3"
+     width="215">
+        Legend
     </text>
-    <icon
-     follows="top|right"
-     height="16"
-     image_name="map_home.tga"
+    </panel>
+<panel
+ follows="right|top"
+  height="126"
+  top_pad="0"
+  width="238">
+<button
+     follows="right|top"
+     height="22"
+     image_overlay="map_avatar_16.tga"
+     scale_image="true"
+     left="4"
      layout="topleft"
-     left_delta="50"
-     mouse_opaque="true"
-     name="home"
-     top_delta="0"
-     width="16" />
-    <text
+     name="Show My Location"
+     tool_tip="Center map on your avatar&apos;s location"
+     top="6"
+     width="24" >
+		<button.commit_callback
+		function="WMap.ShowAgent" />
+    </button>
+          <text
      type="string"
      length="1"
      follows="top|right"
-     height="16"
+     halign="left"
+     height="13"
+     top_delta="6"
+     left_pad="5"
      layout="topleft"
-     left_pad="4"
-     name="home_label"
-     top_delta="0"
-     width="145">
-        Home
+     name="person_label"
+     width="90">
+        Me
     </text>
-    <icon
-     color="0.5 0.25 1 1"
+    <check_box
+     control_name="MapShowPeople"
      follows="top|right"
      height="16"
-     image_name="legend.tga"
      layout="topleft"
-     left="-230"
+     left="3"
+     name="people_chk"
+     top_pad="9"
+     width="22" />
+    <icon
+     color="0 1 0 1"
+     follows="top|right"
+     height="8"
+     image_name="map_avatar_8.tga"
+     layout="topleft"
+     left_pad="3"
      mouse_opaque="true"
-     name="square2"
-     top="54"
-     width="16" />
-    <text
+     name="person"
+     top_delta="3"
+     width="8" />
+      <text
      type="string"
      length="1"
      follows="top|right"
+     halign="left"
      height="16"
+     top_delta="-2"
+     left_pad="7"
      layout="topleft"
-     left_pad="4"
-     name="auction_label"
-     top_delta="0"
-     width="145">
-        Auction
+     name="person_label"
+     width="90">
+        Person
     </text>
-    <icon
-     color="1 1 0.25 1"
+    <check_box
+     control_name="MapShowInfohubs"
      follows="top|right"
      height="16"
-     image_name="legend.tga"
      layout="topleft"
-     left_delta="50"
+     left="3"
+     name="infohub_chk"
+     top_pad="3"
+     width="22" />
+         <icon
+     follows="top|right"
+     height="16"
+     image_name="map_infohub.tga"
+     layout="topleft"
+     left_pad="0"
      mouse_opaque="true"
-     name="square"
+     name="infohub"
      top_delta="0"
      width="16" />
-    <text
+ <text
      type="string"
      length="1"
      follows="top|right"
+     halign="left"
      height="16"
+     top_delta="2"
+     left_pad="3"
      layout="topleft"
-     left_pad="4"
-     name="land_for_sale_label"
-     top_delta="0"
-     width="145">
-        Land For Sale
+     name="infohub_label"
+     width="90">
+        Infohub
     </text>
-    <button
+    <check_box
+     control_name="MapShowLandForSale"
      follows="top|right"
      height="16"
-     label="Go Home"
-     label_selected="Go Home"
      layout="topleft"
-     left="-90"
-     name="Go Home"
-     tool_tip="Teleport to your home"
-     top="34"
-     width="88" >
-		<button.commit_callback
-		function="WMap.GoHome" />
-	</button>
+     left="3"
+     name="land_for_sale_chk"
+     top_pad="2"
+     width="22" />
     <icon
-     color="0 1 0 1"
      follows="top|right"
-     height="8"
-     image_name="map_avatar_8.tga"
+     height="16"
+     image_name="icon_for_sale.tga"
      layout="topleft"
-     left="-226"
      mouse_opaque="true"
-     name="person"
-     top="84"
-     width="8" />
-    <check_box
-     control_name="MapShowPeople"
+     name="landforsale"
+     top_delta="0"
+     left_pad="0"
+     width="16" />
+         <text
+     type="string"
+     length="1"
      follows="top|right"
+     halign="left"
      height="16"
-     label="Resident"
+     top_delta="2"
+     left_pad="3"
      layout="topleft"
-     left_pad="8"
-     name="people_chk"
-     top_delta="-4"
-     width="110" />
+     name="land_sale_label"
+     width="90">
+        Land Sale
+    </text>
     <icon
+     color="1 1 0.25 1"
      follows="top|right"
      height="16"
-     image_name="map_infohub.tga"
+     image_name="legend.tga"
      layout="topleft"
-     left="-230"
      mouse_opaque="true"
-     name="infohub"
-     top="100"
+     name="square2"
+     left="41"
+     top_pad="-2"
      width="16" />
-    <check_box
-     control_name="MapShowInfohubs"
+    <text
+     type="string"
+     length="1"
      follows="top|right"
      height="16"
-     label="Infohub"
      layout="topleft"
-     left_pad="4"
-     name="infohub_chk"
-     top_delta="0"
-     width="110" />
-    <icon
+     left_pad="0"
+     name="auction_label"
+     top_delta="3"
+     width="100">
+       by owner
+    </text>
+        <icon
+     color="0.5 0.25 1 1"
      follows="top|right"
      height="16"
-     image_name="map_telehub.tga"
+     image_name="legend.tga"
      layout="topleft"
-     left="-230"
      mouse_opaque="true"
-     name="telehub"
-     top="120"
+     name="square2"
+     left="41"
+     top_pad="-3"
      width="16" />
-    <check_box
-     control_name="MapShowTelehubs"
+    <text
+     type="string"
+     length="1"
      follows="top|right"
      height="16"
-     label="Telehub"
      layout="topleft"
-     left_pad="4"
-     name="telehub_chk"
-     top_delta="0"
-     width="110" />
-    <icon
+     left_pad="0"
+     name="auction_label"
+     top_delta="3"
+     width="170">
+        land auction
+    </text>
+
+    <button
      follows="top|right"
-     height="16"
-     image_name="icon_for_sale.tga"
+     height="22"
+     image_overlay="map_home.tga"
+     scale_image="true"
+     label_color="White"
      layout="topleft"
-     left="-230"
-     mouse_opaque="true"
-     name="landforsale"
-     top="140"
-     width="16" />
-    <check_box
-     control_name="MapShowLandForSale"
+     left="136"
+     top="6"
+     name="Go Home"
+     tool_tip="Teleport home"
+     width="24" >
+		<button.commit_callback
+		function="WMap.GoHome" />
+        </button>
+             <text
+     type="string"
+     length="1"
      follows="top|right"
-     height="16"
-     label="Land for Sale"
+     halign="left"
+     height="13"
+     top_delta="6"
+     left_pad="5"
      layout="topleft"
-     left_pad="4"
-     name="land_for_sale_chk"
-     top_delta="0"
-     width="110" />
+     name="Home_label"
+     width="70">
+        Home
+    </text>
     <text
      type="string"
      length="1"
      follows="top|right"
+     halign="left"
      height="16"
      layout="topleft"
-     left="-104"
+     left="137"
      name="events_label"
-     top="80"
-     width="145">
+     top_pad="9"
+     width="66">
         Events:
     </text>
-    <icon
+
+    <check_box
+     control_name="MapShowEvents"
+     follows="top|right"
+     height="16"
+     layout="topleft"
+     left="135"
+     top_pad="1"
+     name="event_chk"
+     width="22" />
+         <icon
      follows="top|right"
      height="16"
      image_name="map_event.tga"
      layout="topleft"
-     left="-92"
      mouse_opaque="true"
      name="event"
-     top="100"
+     left_pad="0"
      width="16" />
+      <text
+     type="string"
+     length="1"
+     follows="top|right"
+     halign="left"
+     height="16"
+     top_delta="2"
+     left_pad="3"
+     layout="topleft"
+     name="pg_label"
+     width="60">
+        PG
+    </text>
+
     <check_box
-     control_name="MapShowEvents"
+     control_name="ShowMatureEvents"
      follows="top|right"
      height="16"
-     label="PG"
+     initial_value="true"
      layout="topleft"
-     left_pad="4"
-     name="event_chk"
-     top_delta="0"
-     width="55" />
+     left="135"
+     name="event_mature_chk"
+     top_pad="3"
+     width="22" />
     <icon
      follows="top|right"
      height="16"
      image_name="map_event_mature.tga"
      layout="topleft"
-     left="-92"
      mouse_opaque="true"
      name="events_mature_icon"
-     top="120"
+     top_delta="0"
+     left_pad="0"
      width="16" />
+           <text
+     type="string"
+     length="1"
+     follows="top|right"
+     halign="left"
+     height="16"
+     top_delta="2"
+     left_pad="3"
+     layout="topleft"
+     name="mature_label"
+     width="66">
+        Mature
+    </text>
+
     <check_box
-     control_name="ShowMatureEvents"
+     control_name="ShowAdultEvents"
      follows="top|right"
      height="16"
-     initial_value="true"
-     label="Mature"
      layout="topleft"
-     left_pad="4"
-     name="event_mature_chk"
-     top_delta="0"
-     width="55" />
+     left="135"
+     name="event_adult_chk"
+     top_pad="3"
+     width="22" />
     <icon
      follows="top|right"
      height="16"
      image_name="map_event_adult.tga"
      layout="topleft"
-     left="-92"
+     left_pad="0"
      mouse_opaque="true"
      name="events_adult_icon"
-     top="140"
+     top_delta="0"
      width="16" />
-    <check_box
-     control_name="ShowAdultEvents"
+                <text
+     type="string"
+     length="1"
      follows="top|right"
+     halign="left"
      height="16"
-     label="Adult"
+     top_delta="2"
+     left_pad="3"
      layout="topleft"
-     left_pad="4"
-     name="event_adult_chk"
-     top_delta="0"
-     width="55" />
-    <icon
+     name="pg_label"
+     width="66">
+        Adult
+    </text>
+</panel>
+
+
+  <panel
+   follows="right|top"
+  height="22"
+  top_pad="0"
+  width="238"
+  background_visible="true"
+  bg_alpha_color="DkGray2">
+    <text
+     text_color="White"
+     font="SansSerifLarge"
+     type="string"
+     length="1"
+     follows="top|right"
+     halign="left"
+     height="16"
+     layout="topleft"
+     left="15"
+     name="find_on_map_label"
+     top="3"
+     width="215">
+        Find on Map
+    </text>
+  </panel>
+
+    <panel
+ follows="right|top|bottom"
+  height="270"
+  top_pad="0"
+  width="238">
+      <icon
      color="0.5 0 0 1"
      follows="top|right"
      height="16"
      image_name="map_track_16.tga"
      layout="topleft"
-     left="-230"
+     left="5"
+     top="11"
      mouse_opaque="true"
-     name="avatar_icon"
-     top="164"
+     name="friends_icon"
      width="16" />
     <combo_box
      allow_text_entry="true"
      follows="top|right"
-     height="20"
+     height="23"
      label="Online Friends"
      layout="topleft"
-     left_pad="4"
+     top_delta="-4"
+     left_pad="5"
      max_chars="60"
      name="friend combo"
-     tool_tip="Friend to show on map"
-     top_delta="-4"
-     width="202">
+     tool_tip="Show friends on map"
+     width="182">
         <combo_box.item
-         label="Online Friends"
+         label="My Friends Online"
          name="item1"
          value="None" />
 		<combo_box.commit_callback
 		function="WMap.AvatarCombo"/>
     </combo_box>
-    <icon
+   <icon
      color="0.5 0 0 1"
      follows="top|right"
      height="16"
      image_name="map_track_16.tga"
      layout="topleft"
-     left="-230"
+     left="5"
+     top_pad="8"
      mouse_opaque="true"
      name="landmark_icon"
-     top="189"
      width="16" />
     <combo_box
      allow_text_entry="true"
      follows="top|right"
-     height="20"
-     label="Landmarks"
+     height="23"
+     label="My Landmarks"
      layout="topleft"
-     left_pad="4"
+     top_delta="-3"
+     left_pad="5"
      max_chars="64"
      name="landmark combo"
      tool_tip="Landmark to show on map"
-     top_delta="-4"
-     width="202">
+     width="182">
         <combo_box.item
-         label="Landmarks"
+         label="My Landmarks"
          name="item1"
          value="None" />
 		<combo_box.commit_callback
 		function="WMap.Landmark"/>
     </combo_box>
-    <icon
+       <icon
      color="0.5 0 0 1"
      follows="top|right"
      height="16"
      image_name="map_track_16.tga"
      layout="topleft"
-     left="-230"
+     left="5"
+     top_pad="7"
      mouse_opaque="true"
-     name="location_icon"
-     top="214"
+     name="region_icon"
      width="16" />
-    <line_editor
+    <search_editor
      follows="top|right"
-     height="20"
-     label="Search by Region Name"
+  search_button_visible="false"
+     height="22"
+  text_readonly_color="DkGray"
+     label="Regions by Name"
      layout="topleft"
-     left_pad="4"
+     top_delta="-2"
+     left_pad="5"
      name="location"
      select_on_focus="true"
      tool_tip="Type the name of a region"
-     top_delta="-4"
-     width="140" />
-    <button
+     width="152" />
+   <button
      follows="top|right"
-     height="20"
-     label="Search"
+     height="23"
+     label="Find"
      layout="topleft"
-     left_pad="5"
+     left_pad="2"
+     top_delta="-1"
      name="DoSearch"
      tool_tip="Search for region"
-     top_delta="0"
-     width="60">
+     width="58">
 		<button.commit_callback
 		function="WMap.Location" />
-	</button>
-    <text
-     type="string"
-     length="1"
-     follows="top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="-230"
-     name="search_label"
-     top="234"
-     width="222">
-        Search Results:
-    </text>
+    </button>
     <scroll_list
      draw_stripes="false"
-     follows="top|right|bottom"
-     height="200"
+     bg_writeable_color="MouseGray"
+     follows="all"
+     height="115"
      layout="topleft"
-     left_delta="0"
+     left="28"
      name="search_results"
-     top_pad="10"
-     width="222"
+     top_pad="5"
+     width="209"
      sort_column="1">
         <scroll_list.columns
          label=""
@@ -407,35 +512,87 @@
         <scroll_list.columns
          label=""
          name="sim_name"
-         width="206" />
+         width="193" />
 		<scroll_list.commit_callback
 		function="WMap.SearchResult" />
     </scroll_list>
-    <text
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Teleport"
+     layout="topleft"
+     left="25"
+     name="Teleport"
+     tool_tip="Teleport to selected location"
+     top_pad="7"
+     width="104">
+		<button.commit_callback
+		function="WMap.Teleport" />
+    </button>
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Copy SLurl"
+     layout="topleft"
+     left_pad="5"
+     name="copy_slurl"
+     tool_tip="Copies current location as SLurl to be used on the web."
+     top_delta="0"
+     width="104">
+		<button.commit_callback
+		function="WMap.CopySLURL" />
+    </button>
+   <!-- <button
+     follows="right|bottom"
+     height="23"
+     label="Clear"
+     layout="topleft"
+     left="10"
+     name="Clear"
+     tool_tip="Stop tracking"
+     top_pad="5"
+     width="105">
+		<button.commit_callback
+		function="WMap.Clear" />
+    </button>-->
+    <button
+     enabled="false"
+     follows="right|bottom"
+     height="23"
+     label="Show Selection"
+     left="25"
+     top_pad="5"
+     name="Show Destination"
+     tool_tip="Center map on selected location"
+     width="213">
+		<button.commit_callback
+		function="WMap.ShowTarget" />
+    </button>
+
+<!-- <text
      type="string"
      length="1"
      follows="bottom|right"
-     font="SansSerif"
+     halign="left"
      height="16"
-     layout="topleft"
-     left_delta="0"
-     name="location_label"
      top_pad="4"
-     width="98">
+     left="25"
+     layout="topleft"
+     name="land_sale_label"
+     width="250">
         Location:
     </text>
-    <spinner
+      <spinner
      decimal_digits="0"
      follows="bottom|right"
-     height="16"
      increment="1"
      initial_value="128"
      layout="topleft"
-     left_delta="70"
+     top_pad="0"
+     left="25"
      max_val="255"
      name="spin x"
      tool_tip="X coordinate of location to show on map"
-     top_delta="0"
      width="48">
 		<spinner.commit_callback
 		function="WMap.CommitLocation" />
@@ -459,7 +616,6 @@
     <spinner
      decimal_digits="0"
      follows="bottom|right"
-     height="16"
      increment="1"
      initial_value="0"
      layout="topleft"
@@ -471,89 +627,58 @@
      width="48">
 		<spinner.commit_callback
 		function="WMap.CommitLocation" />
-    </spinner>
-    <button
-     follows="right|bottom"
-     height="20"
-     label="Teleport"
-     label_selected="Teleport"
-     layout="topleft"
-     left="-230"
-     name="Teleport"
-     tool_tip="Teleport to selected location"
-     top="494"
-     width="90">
-		<button.commit_callback
-		function="WMap.Teleport" />
-    </button>
-    <button
-     follows="right|bottom"
-     height="20"
-     label="Show Destination"
-     label_selected="Show Destination"
-     layout="topleft"
-     left_pad="10"
-     name="Show Destination"
-     tool_tip="Center map on selected location"
-     top_delta="0"
-     width="125">
-		<button.commit_callback
-		function="WMap.ShowTarget" />
-    </button>
-    <button
-     follows="right|bottom"
-     height="20"
-     label="Clear"
-     label_selected="Clear"
-     layout="topleft"
-     left="-230"
-     name="Clear"
-     tool_tip="Stop tracking"
-     top="518"
-     width="90">
-		<button.commit_callback
-		function="WMap.Clear" />
-    </button>
-    <button
-     follows="right|bottom"
-     height="20"
-     label="Show My Location"
-     label_selected="Show My Location"
+    </spinner>-->
+    </panel>
+      <panel
+    follows="right|bottom"
+  height="22"
+  top_pad="0"
+  width="238"
+  background_visible="true"
+  bg_alpha_color="DkGray2">
+    <text
+     text_color="White"
+     font="SansSerifLarge"
+     type="string"
+     length="1"
+     follows="top|right"
+     halign="left"
+     height="16"
      layout="topleft"
-     left_pad="10"
-     name="Show My Location"
-     tool_tip="Center map on your avatar&apos;s location"
-     top_delta="0"
-     width="125" >
-		<button.commit_callback
-		function="WMap.ShowAgent" />
-    </button>
-    <button
-     enabled="false"
-     follows="bottom|right"
-     height="20"
-     label="Copy SLurl to clipboard"
+     left="15"
+     name="zoom_label"
+     top="3"
+     width="210">
+        Zoom
+    </text>
+  </panel>
+    <panel
+ follows="right|bottom"
+  height="30"
+  min_height="30"
+  top_pad="0"
+  width="238">
+  <icon
+     follows="left|bottom"
+     height="16"
+     image_name="Zoom_Off"
      layout="topleft"
-     left="-230"
-     name="copy_slurl"
-     tool_tip="Copies current location as SLurl to be used on the web."
-     top="542"
-     width="222">
-		<button.commit_callback
-		function="WMap.CopySLURL" />
-    </button>
+     left="20"
+     mouse_opaque="true"
+     name="zoom_icon"
+     top_pad="7"
+     width="16" />
     <slider
-     follows="right|bottom"
+     follows="left|bottom"
      height="16"
      increment="0.2"
-     initial_value="48.5029"
-     label="Zoom"
+     initial_value="-2"
+     left_pad="0"
      layout="topleft"
-     left_delta="0"
      max_val="0"
      min_val="-8"
      name="zoom slider"
      show_text="false"
-     top_pad="8"
-     width="222" />
+     width="200" />
+     </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index d99205b2fe..eee1134d15 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -104,7 +104,7 @@
                       min_width="333"
                       mouse_opaque="false"
                       name="side_tray_container"
-                      user_resize="true"
+                      user_resize="false"
                       visible="false"
                       width="333"/>
       </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 643336cf6c..c3a2540b2e 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -27,7 +27,6 @@
          function="Avatar.IM" />
     </menu_item_call>
     <menu_item_call
-     enabled="false"
      label="Call"
      layout="topleft"
      name="Call">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ae8a1599a9..37136af680 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3268,6 +3268,17 @@
         </menu>
         <menu_item_separator
          layout="topleft" />
+        <menu_item_check
+         label="HTTP Textures"
+         layout="topleft"
+         name="HTTP Textures">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="ImagePipelineUseHTTP" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="ImagePipelineUseHTTP" />
+        </menu_item_check>
         <menu_item_call
          label="Compress Images"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f48cc6d4bf..0d7351395a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4499,14 +4499,14 @@ You don&apos;t have permission to copy this.
   <notification
    icon="notifytip.tga"
    name="InventoryAccepted"
-   type="notifytip">
+   type="offer">
 [NAME] received your inventory offer.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="InventoryDeclined"
-   type="notifytip">
+   type="offer">
 [NAME] declined your inventory offer.
   </notification>
 
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index ec3f7ea7c5..7f847237ce 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -319,38 +319,82 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          layout="topleft"
          min_height="28"
          top="0"
-         name="sys_well_panel"
-         width="54"
-         min_width="54"
+         name="im_well_panel"
+         width="34"
+         min_width="34"
+         user_resize="false">
+            <chiclet_im_well
+             follows="right"
+             height="23"
+             layout="topleft"
+             left="0"
+             name="im_well"
+             top="4"
+             width="34">
+                <button
+                 auto_resize="true"
+                 flash_color="EmphasisColor"
+                 follows="right"
+                 halign="center"
+                 height="23"
+                 image_overlay="Notices_Unread"
+                 image_overlay_alignment="center" 
+                 image_pressed="PushButton_Press"
+                 image_pressed_selected="PushButton_Selected_Press"
+                 image_selected="PushButton_Selected_Press"
+                 left="0"
+                 name="Unread IM messages"
+                 pad_left="0"
+                 pad_right="0"
+                 width="34" >
+                    <button.init_callback
+                     function="Button.SetDockableFloaterToggle"
+                     parameter="im_well_window" />
+                </button>
+            </chiclet_im_well>
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         top="0"
+         name="notification_well_panel"
+         width="34"
+         min_width="34"
          user_resize="false">
             <chiclet_notification
              follows="right"
              height="23"
              layout="topleft"
              left="0"
-             name="sys_well"
+             name="notification_well"
              top="4"
-             width="54">
+             width="34">
               <button
                  image_selected="PushButton_Selected_Press"
                  image_pressed="PushButton_Press"
 		 image_pressed_selected="PushButton_Selected_Press"
               auto_resize="true"
-               halign="right"
+               halign="center"
                height="23"
                follows="right"
                flash_color="EmphasisColor"
                left="0"
                name="Unread"
                image_overlay="Notices_Unread"
-               image_overlay_alignment="right" 
-               pad_right="6"
-               pad_left="6"
-               width="54"
-               />
+               image_overlay_alignment="center" 
+               pad_right="0"
+               pad_left="0"
+               width="34" >
+                  <button.init_callback
+                   function="Button.SetDockableFloaterToggle"
+                   parameter="notification_well_window" />
+              </button>
 	    </chiclet_notification>
         </layout_panel>
-       <icon
+        <icon
          auto_resize="false"
          color="0 0 0 0"
          follows="left|right"
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 1e570bf207..ccd754ac5e 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- height="175"
+ height="152"
  label="im_panel"
  layout="topleft"
  left="0"
@@ -83,13 +83,4 @@
      width="285"
      word_wrap="true"
      max_length="350" />
-    <button
-     follows="bottom"
-     height="23"
-     label="Reply"
-     layout="topleft"
-     left="100"
-     name="reply"
-     top="144"
-     width="100" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index a9a02e8fc7..d07d4ea25f 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -6,7 +6,7 @@
  left="0"
  name="panel_login"
  top="600"
- width="800">
+ width="996">
     <panel.string
      name="create_account_url">
         http://join.secondlife.com/
@@ -27,128 +27,79 @@
      border_visible="false"
      bottom="600"
      follows="all"
-	 hide_loading="true"
+     hide_loading="true"
      left="0"
      name="login_html"
      start_url=""
      top="0"
      height="600"
-     width="800"/>
+     width="996" />
     <panel
      follows="left|bottom|right"
      name="login_widgets"
      layout="topleft"
-     left="0"
-     top="0">
+     top="519"
+     width="996"
+     height="80">
     <text
      follows="left|bottom"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="16"
-     left="32"
+     left="20"
      name="first_name_text"
-     top="530"
-     width="120">
-        First Name:
+     top="20"
+     width="135">
+        Name:
     </text>
     <line_editor
      follows="left|bottom"
-     font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
+     height="23"
+     label="First"
      left_delta="0"
      max_length="31"
      name="first_name_edit"
      select_on_focus="true"
      tool_tip="[SECOND_LIFE] First Name"
-     top_pad="2"
-     width="120" />
-    <text
-     follows="left|bottom"
-     font="SansSerif"
-     height="16"
-     left="164"
-     name="last_name_text"
-     top="530"
-     width="120">
-        Last Name:
-    </text>
+     top_pad="0"
+     width="135" />
     <line_editor
      follows="left|bottom"
-     font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
-     left_delta="0"
+     height="23"
+     label="Last"
+     left_pad="8"
      max_length="31"
      name="last_name_edit"
      select_on_focus="true"
      tool_tip="[SECOND_LIFE] Last Name"
-     top_pad="2"
-     width="120" />
-    <text
-     follows="left|bottom"
-     font="SansSerif"
-     height="16"
-     left="296"
-     name="password_text"
-     top="530"
-     width="120">
-        Password:
-    </text>
-    <line_editor
-     follows="left|bottom"
-     font="SansSerif"
-     handle_edit_keys_directly="true"
-     height="20"
-     left_delta="0"
-     max_length="16"
-     name="password_edit"
-     select_on_focus="true"
-     top_pad="2"
-     width="120" />
-     <button
-     follows="left|bottom"
-     height="23"
-     label="Log In"
-     label_selected="Log In"
-     layout="topleft"
-     left="425"
-     name="connect_btn"
-     top="546"
-     width="100" />
-    <combo_box
-     allow_text_entry="true"
-     follows="left|bottom"
-     height="23"
-     layout="topleft"
-     left_pad="5"
-     name="server_combo"
-     width="100" />
+     top_delta="0"
+     width="135" />
     <text
      follows="left|bottom"
-     font="SansSerif"
-     height="16"
-     left="32"
+     font="SansSerifSmall"
+     height="15"
+     left_pad="8"
      name="start_location_text"
-     top="576"
-     width="95">
-        Start location:
+     top="20"
+     width="135">
+        Starting location:
     </text>
     <combo_box
      allow_text_entry="true"
      control_name="LoginLocation"
      follows="left|bottom"
      height="23"
-     left_pad="0"
      max_chars="128"
+     top_pad="0"
      name="start_location_combo"
-     top_delta="-2"
-     width="155">
+     width="135">
         <combo_box.item
-         label="My Last Location"
+         label="My last location"
          name="MyLastLocation"
          value="last" />
         <combo_box.item
-         label="My Home"
+         label="My home"
          name="MyHome"
          value="home" />
         <combo_box.item
@@ -156,43 +107,91 @@
          name="Typeregionname"
          value="" />
     </combo_box>
+      <combo_box
+     allow_text_entry="true"
+     font="SansSerifSmall"
+     follows="left|bottom"
+     height="23"
+     layout="topleft"
+     top="60"
+     name="server_combo"
+     width="135"
+     visible="false" />
+     <text
+     follows="left|bottom"
+     font="SansSerifSmall"
+     height="15"
+     left_pad="3"
+     name="password_text"
+     top="20"
+     width="135">
+        Password:
+    </text>
+    <line_editor
+     follows="left|bottom"
+     handle_edit_keys_directly="true"
+     height="23"
+     left_delta="0"
+     max_length="16"
+     name="password_edit"
+     select_on_focus="true"
+     top_pad="0"
+     width="135" />
     <check_box
      control_name="RememberPassword"
      follows="left|bottom"
+     font="SansSerifSmall"
      height="16"
-     label="Remember password"
-     left_pad="10"
+     label="Remember"
+     left_pad="5"
      name="remember_check"
-     top_delta="3"
-     width="138" />
+     top_delta="5"
+     width="90" />
+     <button
+     follows="left|bottom"
+     height="23"
+     image_unselected="PushButton_On"
+     image_selected="PushButton_On_Selected"
+     label="Log In"
+     label_color="White"
+     layout="topleft"
+     left_pad="20"
+     name="connect_btn"
+     top="35"
+     width="90" />
     <text
      follows="right|bottom"
+     font="SansSerifSmall"
+     text_color="EmphasisColor"
      halign="right"
      height="16"
-     left="-210"
+     top="17"
+     left_pad="10"
+     right="-10"
      name="create_new_account_text"
-     top="539"
-     width="200">
-        Create a new account
+     width="180">
+        Sign up for account
     </text>
     <text
      follows="right|bottom"
+     font="SansSerifSmall"
+     text_color="EmphasisColor"
      halign="right"
      height="16"
-     left_delta="0"
      name="forgot_password_text"
-     top_pad="4"
-     width="200">
+     top_pad="2"
+     width="180">
         Forgot your name or password?
     </text>
     <text
      follows="right|bottom"
+     font="SansSerifSmall"
      halign="right"
-     height="16"
-     left="-310"
+     height="28"
+     top_pad="2"
      name="channel_text"
-     top="579"
-     width="300">
+     width="180"
+     word_wrap="true">
         [VERSION]
     </text>
   </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 9702bd41c8..e8e4a9dbb2 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -154,7 +154,15 @@
      left="0"
      name="favorite"
      image_drag_indication="arrow_down.tga"
-     chevron_button_tool_tip="Show more of My Favorites"
-     bottom="62"
-     width="590" />
+   bottom="62"
+   width="590">
+    <chevron_button name=">>"
+                     image_unselected="TabIcon_Close_Off"
+                     image_selected="TabIcon_Close_Off"
+                     tab_stop="false"
+                     follows="left|bottom" 
+                     tool_tip="Show more of My Favorites" 
+                     width="15"
+                     height="15"/>
+  </favorites_bar>
 </panel>
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 d805209bf5..51997a2813 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -17,7 +17,7 @@
         <accordion_tab
          layout="topleft"
          name="tab_outfits"
-         title="Outfits bar">
+         title="Outfits">
 	 <inventory_panel 
 	 	 allow_multi_select="true" 
 		 border="true" 
@@ -33,7 +33,7 @@
         <accordion_tab
          layout="topleft"
          name="tab_cof"
-         title="Current Outfit bar">
+         title="Current Outfit">
 	 <inventory_panel 
 	 	 allow_multi_select="true" 
 		 border="true" 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 23832ba120..29e9b476eb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -78,7 +78,7 @@
      top_pad="10"
      width="350" />
     <check_box
-     control_name="AutoPlayMedia"
+     control_name="ParcelMediaAutoPlayEnable"
      height="16"
      label="Allow Media Autoplay"
      layout="topleft"
@@ -86,15 +86,6 @@
      name="autoplay_enabled"
      top_pad="10"
      width="350" />
-    <check_box
-     control_name="ParcelMediaAutoPlayEnable"
-     height="16"
-     label="Automatically Play Parcel Media"
-     layout="topleft"
-     left="30"
-     name="parcel_autoplay_enabled"
-     top_pad="10"
-     width="350" />
    <text
       type="string"
     length="1"
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 8b86067b03..e21de31498 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
@@ -3,7 +3,7 @@
 	follows="left|right|top|bottom"
 	name="MediaControls"
 	background_visible="false"
-	height="192"
+	height="200"
 	layout="topleft"
 	mouse_opaque="false"
 	width="800">
@@ -16,20 +16,20 @@
   <string name="zoom_far_padding">1.5</string>
   <panel
 	  name="media_region"
-	  bottom="125"
+	  height="100"
 	  follows="left|right|top|bottom"
 	  layout="topleft"
 	  mouse_opaque="false"
-	  top="20" />
+	  top="0" />
   <layout_stack
 	  name="media_controls"
 	  follows="left|right"
 	  animate="false"
-	  height="26"
+	  height="75"
 	  layout="topleft"
 	  left="0"
 	  orientation="horizontal"
-	  top="128">
+	  top="100">
 	<!-- outer layout_panels center the inner one -->
 	<layout_panel
 		name="left_bookend"
@@ -239,19 +239,6 @@
 		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" 
@@ -314,8 +301,9 @@
 	  <slider_bar
 		  name="media_play_slider"
 		  follows="left|right|top"
-		  height="16"
-		  increment="0.05"
+		  height="20"
+		  bottom="88"
+		  increment="0.01"
 		  initial_value="0.5"
 		  layout="topleft"
 		  tool_tip="Movie play progress"
@@ -379,7 +367,8 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		height="22"
+		top="-50"
+		height="72"
 		min_width="22"
 		width="22">
 	  <!-- Note: this is not quite right either...the mute button is not the -->
@@ -397,138 +386,30 @@
 		  layout="topleft"
 		  scale_image="false" 
 		  tool_tip="Mute This Media"
-		  top_delta="18"
+		  top="118"
 		  min_width="22"
 		  width="22" >
 		<button.commit_callback
 			function="MediaCtrl.ToggleMute" />
+		<button.mouseenter_callback
+			function="MediaCtrl.ShowVolumeSlider" />
 	  </button>
-	</layout_panel>
-	<!-- We do not have a design yet for "volume", so this is a temporary -->
-	<!-- solution.  See DEV-42827. -->
-	<layout_panel
-		name="volume_up"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		min_width="14"
-		height="14"
-		width="14">
-	  <button
-		  image_overlay="media_btn_scrollup.png"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  top="-5"
-		  height="14"
-		  layout="topleft"
-		  tool_tip="Volume up"
-		  scale_image="true"
-		  min_width="14"
-		  width="14" >
-		<button.commit_callback
-			function="MediaCtrl.CommitVolumeUp" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="volume_down"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		min_width="14"
-		height="14"
-		width="14">
-	  <button
-		  image_overlay="media_btn_scrolldown.png"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  layout="topleft"
-		  tool_tip="Volume down"
-		  scale_image="true"
-		  top="-5"
-		  height="14"
-		  min_width="14"
-		  width="14">
-		<button.commit_callback
-			function="MediaCtrl.CommitVolumeDown" />
-	  </button>
-	</layout_panel>
-	<!-- Scroll pad -->
-	<!-- This was removed from the design, but is still here because it is --> 
-	<!-- complex, and recreating it would be hard.  In case the design -->
-	<!-- changes, here it lies: --> 
-	<!--
-	<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"
-		  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"
-		  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"
-		  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"
+	  <slider
+		  orientation="vertical"
+		  left="0"
+		  top="-2"
+		  height="50"
 		  layout="topleft"
-		  left="12"
-		  tool_tip="Scroll down"
-		  scale_image="false"
-		  top="20"
-		  min_width="8"
-		  width="8" />
+		  increment="0.01"
+		  initial_value="0.5"
+		  name="volume_slider"
+		  tool_tip="Media Volume"
+		  show_text="false"
+		  volume="true">
+		<slider.commit_callback
+			function="MediaCtrl.Volume"/>
+	  </slider>
 	</layout_panel>
-	-->
 	<panel
 		height="28"
 		layout="topleft"
@@ -628,7 +509,7 @@
 	  animate="false"
 	  left="0"
 	  orientation="horizontal"
-	  top="150">
+	  top="170">
 	<!-- outer layout_panels center the inner one -->
 	<layout_panel
 		width="0"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 947bb67152..6be203ef9c 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -287,7 +287,7 @@
          mouse_opaque="false"
          name="add_friend"
          top="5"
-         width="76" />
+         width="77" />
         <button
          follows="bottom|left"
          height="19"
@@ -296,7 +296,7 @@
          name="im"
          top="5"
          left_pad="5"
-         width="31" />
+         width="33" />
         <button
          follows="bottom|left"
          height="19"
@@ -315,7 +315,7 @@
          name="show_on_map_btn"
          top="5"
          left_pad="5"
-         width="42" />
+         width="44" />
         <button
          follows="bottom|left"
          height="19"
@@ -324,7 +324,7 @@
          name="teleport"
          left_pad="5"
          top="5"
-         width="64" />
+         width="67" />
         <button
          follows="bottom|right"
          height="19"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
deleted file mode 100644
index bffd84877f..0000000000
--- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="top|left"
- height="360"
- label="Region"
- layout="topleft"
- left="0"
- name="General"
- top="360"
- width="280">
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="region_text_lbl"
-     top="10"
-     width="100">
-        Region:
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="region_text"
-     top_delta="0"
-     width="200">
-        unknown
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="version_channel_text_lbl"
-     top="30"
-     width="100">
-        Version:
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="version_channel_text"
-     top_delta="0"
-     width="200">
-        unknown
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="region_type_lbl"
-     top="50"
-     width="100">
-        Type:
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="region_type"
-     top_delta="0"
-     width="200">
-        unknown
-    </text>
-    <check_box
-     height="20"
-     label="Block Terraform"
-     layout="topleft"
-     left="10"
-     name="block_terraform_check"
-     top="70"
-     width="80" />
-    <check_box
-     height="20"
-     label="Block Fly"
-     layout="topleft"
-     left="10"
-     name="block_fly_check"
-     top="90"
-     width="80" />
-    <check_box
-     height="20"
-     label="Allow Damage"
-     layout="topleft"
-     left="10"
-     name="allow_damage_check"
-     top="110"
-     width="80" />
-    <check_box
-     height="20"
-     label="Restrict Pushing"
-     layout="topleft"
-     left="10"
-     name="restrict_pushobject"
-     top="130"
-     width="80" />
-    <check_box
-     height="20"
-     label="Allow Land Resell"
-     layout="topleft"
-     left="10"
-     name="allow_land_resell_check"
-     top="160"
-     width="80" />
-    <check_box
-     height="20"
-     label="Allow Land Join/Divide"
-     layout="topleft"
-     left="10"
-     name="allow_parcel_changes_check"
-     top="180"
-     width="80" />
-    <check_box
-     height="20"
-     label="Block Land Show in Search"
-     layout="topleft"
-     left="10"
-     name="block_parcel_search_check"
-     tool_tip="Let people see this region and its parcels in search results"
-     top="200"
-     width="80" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="1"
-     label="Agent Limit"
-     label_width="97"
-     layout="topleft"
-     left="10"
-     max_val="100"
-     min_val="1"
-     name="agent_limit_spin"
-     top="240"
-     width="170" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Object Bonus"
-     label_width="97"
-     layout="topleft"
-     left="10"
-     max_val="10"
-     min_val="1"
-     name="object_bonus_spin"
-     top="260"
-     width="170" />
-    <text
-     follows="left|top"
-     height="20"
-     label="Maturity"
-     layout="topleft"
-     left="10"
-     name="access_text"
-     top="290"
-     width="100">
-        Rating:
-    </text>
-    <combo_box
-     height="20"
-     label="Mature"
-     layout="topleft"
-     left_delta="100"
-     name="access_combo"
-     top_delta="0"
-     width="85">
-        <combo_box.item
-         label="Adult"
-         name="Adult"
-         value="42" />
-        <combo_box.item
-         label="Mature"
-         name="Mature"
-         value="21" />
-        <combo_box.item
-         label="PG"
-         name="PG"
-         value="13" />
-    </combo_box> 
-    <button
-     enabled="false"
-     follows="left|top"
-     height="20"
-     label="Apply"
-     layout="topleft"
-     left="108"
-     name="apply_btn"
-     top="320"
-     width="100"/>
-   <button
-     follows="left|top"
-     height="20"
-     label="Teleport Home One User..."
-     layout="topleft"
-     left="10"
-     name="kick_btn"
-     top_pad="10"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Teleport Home All Users..."
-     layout="topleft"
-     left_delta="0"
-     name="kick_all_btn"
-     top_pad="3"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Send Message To Region..."
-     layout="topleft"
-     left_delta="0"
-     name="im_btn"
-     top_pad="20"
-     width="200" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Manage Telehub..."
-     layout="topleft"
-     left_delta="0"
-     name="manage_telehub_btn"
-     top_pad="20"
-     width="150" >
-		<button.commit_callback
-         function="RegionInfo.ManageTelehub" />
-    </button> 
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 95242a9639..63b7112c17 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -23,6 +23,7 @@
     background_visible="true"
   >
       <panel
+        class="panel_sidetray_home"
         name="panel_home"
         filename="panel_sidetray_home_tab.xml"
         label="home"
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 9839075862..4b841b0a09 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -1,265 +1,92 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- Part of side tray, see that XML file for panel config -->
+<!-- the web-based Home panel of the side tray -->
 <panel
  follows="all"
- height="560"
+ height="570"
+ min_height="350"
  label="home_tab"
+ help_topic="sidetray_home"
  layout="topleft"
+ top="0"
+ left="0"
  name="home_tab"
  width="333">
-  <scroll_container
-   color="DkGray"
+  <layout_stack
    follows="all"
+   height="550"
    layout="topleft"
-   left="0"
-   name="profile_scroll"
-   opaque="true"
-   height="560"
-   width="333"
-   top="0">
-  <panel
-   background_visible="true"
-   height="560"
-   layout="topleft"
-   name="profile_scroll_panel"
-   top="0"
-   left="0"
-   width="311">
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     class="panel_sidetray_home_info"
-     follows="left|top|right"
-     height="90"
-     layout="topleft"
-     left="15"
-     top="17"
-     name="sidebar_people"
-     width="303">
-        <text
-         follows="left|right|top"
-         font="SansSerifBigBold"
-         height="30"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_name"
-         text_color="EmphasisColor"
-         top="10"
-         value="People"
-         width="200"
-         word_wrap="true" />
-        <icon
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         name="tab_icon"
-         right="-10"
-         top="10"
-         image_name="TabIcon_People_Selected"
-         width="20" />
-        <text
-         follows="left|right|bottom"
-         height="90"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_description"
-         right="-10"
-         text_color="white"
-         top="40"
-         word_wrap="true">
-            Find your friends, your groups, contacts and people nearby.
-        </text>
-    </panel>
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     class="panel_sidetray_home_info"
-     follows="left|top|right"
-     height="90"
-     layout="topleft"
-     left="15"
-     top_pad="15"
-     name="sidebar_places"
-     width="303">
-        <text
-         follows="left|right|top"
-         font="SansSerifBigBold"
-         height="30"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_name"
-         text_color="EmphasisColor"
-         top="10"
-         value="Places"
-         width="200"
-         word_wrap="true" />
-        <icon
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         name="tab_icon"
-         right="-10"
-         top="10"
-         width="20"
-         image_name="TabIcon_Places_Selected"/>
-        <text
-         follows="all"
-         height="90"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_description"
-         right="-10"
-         text_color="white"
-         top="40"
-         word_wrap="true">
-            Find places to go and places you&apos;ve visited before.
-        </text>
-    </panel>
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     class="panel_sidetray_home_info"
-     follows="left|top|right"
-     height="90"
-     layout="topleft"
-     left="15"
-     top_pad="15"
-     name="sidebar_me"
-     width="303">
-        <text
-         follows="left|right|top"
-         font="SansSerifBigBold"
-         height="30"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_name"
-         text_color="EmphasisColor"
-         top="10"
-         value="My Profile"
-         width="200"
-         word_wrap="true" />
-        <icon
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         name="tab_icon"
-         right="-10"
-         top="10"
-         width="20"
-         image_name="TabIcon_Me_Selected"/>
-        <text
-         follows="all"
-         height="90"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_description"
-         right="-10"
-         text_color="white"
-         top="40"
-         word_wrap="true">
-            Edit your public profile.
-        </text>
-    </panel>
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     class="panel_sidetray_home_info"
-     follows="left|top|right"
-     height="90"
+   left="10"
+   name="stack"
+   top_pad="10"
+   width="313">
+    <layout_panel
+     auto_resize="false"
+     height="20"
      layout="topleft"
-     left="15"
-     top_pad="15"
-     name="sidebar_appearance"
-     width="303">
-        <text
-         follows="left|right|top"
-         font="SansSerifBigBold"
-         height="30"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_name"
-         text_color="EmphasisColor"
-         top="10"
-         value="My Appearance"
-         width="200"
-         word_wrap="true" />
-        <icon
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         name="tab_icon"
-         right="-10"
-         top="10"
-         width="20"
-         image_name="TabIcon_Appearance_Selected"/>
-        <text
-         follows="all"
-         height="90"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_description"
-         right="-10"
-         text_color="white"
-         top="40"
-         word_wrap="true">
-            Change your appearance and current look.
-        </text>
-    </panel>
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     class="panel_sidetray_home_info"
-     follows="left|top|right"
-     height="90"
+     left="0"
+     name="nav_controls"
+     top="0"
+     user_resize="false"
+     width="313">
+      <button
+       follows="left|top"
+       enabled="false"
+       height="20"
+       label="Back"
+       layout="topleft"
+       tab_stop="false"
+       left="0"
+       name="back"
+       top="0"
+       width="70">
+        <button.commit_callback
+         function="MediaBrowser.Back" />
+      </button>
+      <button
+       follows="left|top"
+       height="20"
+       enabled="false"
+       label="Forward"
+       layout="topleft"
+       tab_stop="false"
+       left_pad="3"
+       name="forward"
+       top_delta="0"
+       width="70">
+        <button.commit_callback
+         function="MediaBrowser.Forward" />
+      </button>
+      <button
+       follows="left|top"
+       height="20"
+       label="Home"
+       layout="topleft"
+       tab_stop="false"
+       left_pad="2"
+       name="home"
+       top_delta="0"
+       width="70">
+        <button.commit_callback
+         function="MediaBrowser.Home" />
+      </button>
+    </layout_panel>
+    <layout_panel
+     height="530"
      layout="topleft"
-     left="15"
-     top_pad="15"
-     name="sidebar_inventory"
-     width="303">
-        <text
-         follows="left|right|top"
-         font="SansSerifBigBold"
-         height="30"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_name"
-         text_color="EmphasisColor"
-         top="10"
-         value="My Inventory"
-         width="200"
-         word_wrap="true" />
-        <icon
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         name="tab_icon"
-         right="-10"
-         top="10"
-         width="20"
-         image_name="TabIcon_Things_Selected"/>
-        <text
-         follows="all"
-         height="90"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_description"
-         right="-10"
-         text_color="white"
-         top="40"
-         word_wrap="true">
-            Browse your inventory.
-        </text>
-    </panel>
-  </panel>
-  </scroll_container>
+     left_delta="0"
+     name="browser_layout"
+     top_delta="0"
+     width="313">
+      <web_browser
+       border_visible="false"
+       follows="all"
+       height="530"
+       layout="topleft"
+       left="0"
+       name="browser"
+       start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22 text=%22eeeeee%22%3E %3Ch3%3E %0D%0A%0D%0ALoading... %3C/h3%3E %3C/body%3E%3C/html%3E"
+       top="0"
+       width="313" />
+    </layout_panel>
+  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e47ec1ebda..194e359e10 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -88,7 +88,6 @@
 	<string name="BUTTON_MINIMIZE">Minimize</string>
 	<string name="BUTTON_TEAR_OFF">Tear Off</string>
 	<string name="BUTTON_DOCK">Dock</string>
-	<string name="BUTTON_UNDOCK">Undock</string>
 	<string name="BUTTON_HELP">Show Help</string>
 
 	<!-- searching - generic -->
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 2263866471..70ee9fc3b8 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -13,13 +13,11 @@
   minimize_image="Icon_Minimize_Foreground"
   tear_off_image="tearoffbox.tga"
   dock_image="Icon_Dock_Foreground"
-  undock_image="Icon_Undock_Foreground"
   help_image="Icon_Help_Foreground"
   close_pressed_image="Icon_Close_Press"
   restore_pressed_image="Icon_Restore_Press"
   minimize_pressed_image="Icon_Minimize_Press"
   tear_off_pressed_image="tearoff_pressed.tga"
   dock_pressed_image="Icon_Dock_Press"
-  undock_pressed_image="Icon_Undock_Press"
   help_pressed_image="Icon_Help_Press"
   />
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index ea78f6d0dd..d32952b04f 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -53,35 +53,40 @@
     name="voice_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_VoiceNo"
     />
   <fly_icon
     name="fly_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_FlyNo"
     />
   <push_icon
     name="push_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_PushNo"
     />
   <build_icon
     name="build_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_BuildNo"
     />
   <scripts_icon
     name="scripts_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_ScriptsNo"
     />
   <!-- NOTE: Placeholder icon, there is no dark grayscale version -->
@@ -89,7 +94,8 @@
     name="damage_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_Damage"
     />
   <!-- Default text color is invisible on top of nav bar background -->
@@ -98,6 +104,7 @@
 	width="35"
 	height="18"
 	top="16"
+    follows="right|top"
 	halign="right"
 	font="SansSerifSmall"
 	text_color="TextFgColor"