merge

13 files changed, 426 insertions, 544 deletions

diff --git a/indra/newview/skins/default/textures/icon_event_adult.tga b/indra/newview/skins/default/textures/icon_event_adult.tga
index c344fb1e78..f548126e5a 100644
--- a/indra/newview/skins/default/textures/icon_event_adult.tga
+++ b/indra/newview/skins/default/textures/icon_event_adult.tga
diff --git a/indra/newview/skins/default/textures/icon_top_pick.tga b/indra/newview/skins/default/textures/icon_top_pick.tga
index 7fe119a818..0b34882d2f 100644
--- a/indra/newview/skins/default/textures/icon_top_pick.tga
+++ b/indra/newview/skins/default/textures/icon_top_pick.tga
diff --git a/indra/newview/skins/default/textures/map_avatar_16.tga b/indra/newview/skins/default/textures/map_avatar_16.tga
index ce129e3590..f59e9e9193 100644
--- a/indra/newview/skins/default/textures/map_avatar_16.tga
+++ b/indra/newview/skins/default/textures/map_avatar_16.tga
diff --git a/indra/newview/skins/default/textures/map_avatar_8.tga b/indra/newview/skins/default/textures/map_avatar_8.tga
index 28552f2237..8500eadeba 100644
--- a/indra/newview/skins/default/textures/map_avatar_8.tga
+++ b/indra/newview/skins/default/textures/map_avatar_8.tga
diff --git a/indra/newview/skins/default/textures/map_event.tga b/indra/newview/skins/default/textures/map_event.tga
index c229b379a2..2c06d08fd2 100644
--- a/indra/newview/skins/default/textures/map_event.tga
+++ b/indra/newview/skins/default/textures/map_event.tga
diff --git a/indra/newview/skins/default/textures/map_event_adult.tga b/indra/newview/skins/default/textures/map_event_adult.tga
index c344fb1e78..f548126e5a 100644
--- a/indra/newview/skins/default/textures/map_event_adult.tga
+++ b/indra/newview/skins/default/textures/map_event_adult.tga
diff --git a/indra/newview/skins/default/textures/map_event_mature.tga b/indra/newview/skins/default/textures/map_event_mature.tga
index 61c879bc92..71067c0dfd 100644
--- a/indra/newview/skins/default/textures/map_event_mature.tga
+++ b/indra/newview/skins/default/textures/map_event_mature.tga
diff --git a/indra/newview/skins/default/textures/map_home.tga b/indra/newview/skins/default/textures/map_home.tga
index 7478de371a..acaaa3db44 100644
--- a/indra/newview/skins/default/textures/map_home.tga
+++ b/indra/newview/skins/default/textures/map_home.tga
diff --git a/indra/newview/skins/default/textures/map_infohub.tga b/indra/newview/skins/default/textures/map_infohub.tga
index d0134fa5fe..545b8e532c 100644
--- a/indra/newview/skins/default/textures/map_infohub.tga
+++ b/indra/newview/skins/default/textures/map_infohub.tga
diff --git a/indra/newview/skins/default/textures/map_telehub.tga b/indra/newview/skins/default/textures/map_telehub.tga
index ef63a3eb72..545b8e532c 100644
--- a/indra/newview/skins/default/textures/map_telehub.tga
+++ b/indra/newview/skins/default/textures/map_telehub.tga
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 3576b6ed77..b6322ae2bb 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,19 +1,19 @@
 <!--
 This file contains metadata about how to load, display, and scale textures for rendering in the UI.
-Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer 
+Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer
 to them by filename (relative to textures directory).
-NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry 
+NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry
 with the same filename but different name
 
 <texture
   name="MyTexture" (mandatory)
     - this is the name you reference the texture by in XUI.  For example, <button image_unselected="MyTexture"/>
   file_name="images/my_texture.png" (optional)
-    - this is the path to the actual file asset, relative to the current skins "textures" directory.  
-      If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case.  
+    - this is the path to the actual file asset, relative to the current skins "textures" directory.
+      If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case.
       NOTE: you need to provide an extension on the filename (".png", ".tga", ".jpg") for us to decode the image properly
   preload="true" (optional, false by default)
-    - If true, we will attempt to load the image before displaying any UI.  
+    - If true, we will attempt to load the image before displaying any UI.
       If false, we will load in the background after initializing the UI.
   use_mips="true" (currently unused)
   scale.left="1"
@@ -23,8 +23,8 @@ with the same filename but different name
     - Specifies the segmentation for 9-slice image scaling.  Specifically, the pixel offsets from the LOWER LEFT corner
       that define the region of the image that is stretched to make the whole image fit in the required space.
       In this example, if the source image is 32x16 pixels, we have defined a center region that starts one pixel up
-      and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left 
-      corner.  The end result is that the image will keep a 1 pixel border all around while stretching to fit the required 
+      and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left
+      corner.  The end result is that the image will keep a 1 pixel border all around while stretching to fit the required
       region.
 -->
 
@@ -726,7 +726,6 @@ with the same filename but different name
   <texture name="icon_groupnotice.tga" />
   <texture name="icon_groupnoticeinventory.tga" />
   <texture name="icon_place.tga" />
-  <texture name="icon_place_for_sale.tga" />
   <texture name="icon_popular.tga" />
   <texture name="icon_top_pick.tga" />
 
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/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>