From a8c11186e98ec4b0c22f7fd045a7d7f6b6a67a72 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 14 Jan 2010 13:37:40 -0700
Subject: Removed unnecessary xui files from silver skin

---
 ChangeLog.txt                                      |   14 +
 .../skins/default/xui/en-us/floater_about_land.xml |    2 +-
 .../default/xui/en-us/floater_env_settings.xml     |    2 +-
 .../skins/silver/xui/en-us/floater_about_land.xml  | 1040 --------------------
 .../skins/silver/xui/en-us/floater_directory.xml   |  701 -------------
 .../silver/xui/en-us/floater_env_settings.xml      |   66 --
 .../silver/xui/en-us/floater_live_lsleditor.xml    |   23 -
 .../skins/silver/xui/en-us/floater_water.xml       |  260 -----
 .../silver/xui/en-us/floater_windlight_options.xml |  599 -----------
 .../skins/silver/xui/en-us/panel_status_bar.xml    |  123 ---
 .../silver/xui/en-us/panel_voice_controls.xml      |   19 -
 11 files changed, 16 insertions(+), 2833 deletions(-)
 delete mode 100644 linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
 delete mode 100644 linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
 delete mode 100644 linden/indra/newview/skins/silver/xui/en-us/floater_env_settings.xml
 delete mode 100644 linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
 delete mode 100644 linden/indra/newview/skins/silver/xui/en-us/floater_water.xml
 delete mode 100644 linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
 delete mode 100644 linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
 delete mode 100644 linden/indra/newview/skins/silver/xui/en-us/panel_voice_controls.xml

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ea81074..62594de 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,19 @@
 2010-01-14 McCabe Maxsted  <hakushakukun@gmail.com>
 
+	* Removed unnecessary xui files from silver skin.
+	
+	  modified:   linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+	  modified:   linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
+	  deleted:    linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
+	  deleted:    linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
+	  deleted:    linden/indra/newview/skins/silver/xui/en-us/floater_env_settings.xml
+	  deleted:    linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
+	  deleted:    linden/indra/newview/skins/silver/xui/en-us/floater_water.xml
+	  deleted:    linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
+	  deleted:    linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
+	  deleted:    linden/indra/newview/skins/silver/xui/en-us/panel_voice_controls.xml
+
+
 	* Applied patch for VWR-14278 by Aimee Trescothick: 
 	  Gesture auto-completion adds uncommitted suggestions to the line editor history.
 	
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index d31357f..569e421 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -726,7 +726,7 @@ Only large parcels can be listed in search.
 			</combo_box>
 			<button bottom="-140" enabled="true" follows="left|top" font="SansSerif"
 			     halign="center" height="18" label="?" label_selected="?" left="400"
-			     mouse_opaque="true" name="?" width="18" />
+			     mouse_opaque="true" name="?" width="20" />
 			<check_box bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
 			     height="16" initial_value="false" label="Mature Content" left="14"
 			     mouse_opaque="true" name="MatureCheck" radio_style="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
index 68443c5..e2bafbf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
@@ -62,5 +62,5 @@
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
 	     label="Advanced Water" left="300" name="EnvAdvancedWaterButton" width="137" />
 	<button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
-	     left="570" name="EnvSettingsHelpButton" width="18" />
+	     left="570" name="EnvSettingsHelpButton" width="22" />
 </floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
deleted file mode 100644
index 300d7ba..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
+++ /dev/null
@@ -1,1040 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-554" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" can_tear_off="false" enabled="true" height="420"
-     left="367" min_height="420" min_width="460" mouse_opaque="true"
-     name="floaterland" rect_control="FloaterLandRect5" title="About Land"
-     width="460">
-	<tab_container bottom="-420" enabled="true" follows="left|top|right|bottom" height="400"
-	     left="1" mouse_opaque="false" name="landtab" tab_position="top" width="459">
-		<panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" label="General" left="1" mouse_opaque="true"
-		     name="land_general_panel" width="458">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Name:" v_pad="0" width="92">
-				Name:
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-20"
-			     enabled="true" follows="left|top|right" font="SansSerifSmall"
-			     handle_edit_keys_directly="false" height="16" left="98"
-			     max_length="63" mouse_opaque="true" name="Name"
-			     select_all_on_focus_received="false" select_on_focus="false"
-			     width="350" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Description:" v_pad="0" width="100">
-				Description:
-			</text>
-			<text_editor type="string" bevel_style="in" border_style="line" border_thickness="1" bottom="-76"
-			     embedded_items="false" enabled="true" follows="left|top|right"
-			     font="SansSerifSmall" handle_edit_keys_directly="false" height="52"
-			     left="96" max_length="255" mouse_opaque="true" name="Description"
-			     select_all_on_focus_received="false" select_on_focus="false"
-			     width="350" word_wrap="true" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="LandType" v_pad="0" width="92">
-				Type:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="LandTypeText" v_pad="0" width="250">
-				Mainland / Homestead
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="ContentRating" v_pad="0" width="92">
-				Rating:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="ContentRatingText" v_pad="0" width="250">
-				Adult
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Owner:" v_pad="0" width="92">
-				Owner:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="OwnerText" v_pad="0" width="250">
-				Leyla Linden
-			</text>
-			<button bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Profile..." label_selected="Profile..."
-			     left="350" mouse_opaque="true" name="Profile..." scale_image="true"
-			     width="90" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Group:" v_pad="0" width="92">
-				Group:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-162" drop_shadow_visible="true" enabled="false" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="GroupText" v_pad="0" width="250" />
-			<button bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Set..." label_selected="Set..."
-			     left="350" mouse_opaque="true" name="Set..." scale_image="true" width="90" />
-			<check_box bottom="-180" enabled="false" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Allow Deed to Group" left="96"
-			     mouse_opaque="true" name="check deed" radio_style="false"
-			     tool_tip="A group officer can deed this land to the group, so it will be supported by the group&amp;apos;s land allocation."
-			     width="116" />
-			<button bottom="-180" enabled="false" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Deed..." label_selected="Deed..."
-			     left="350" mouse_opaque="true" name="Deed..." scale_image="true"
-			     tool_tip="You may only deed land if you are an officer in the selected group."
-			     width="90" />
-			<check_box bottom="-200" enabled="false" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false"
-			     label="Owner Makes Contribution With Deed" left="96" mouse_opaque="true"
-			     name="check contrib" radio_style="false"
-			     tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."
-			     width="199" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="For Sale:" v_pad="0" width="92">
-				For Sale:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="Not for sale." v_pad="0" width="186">
-				Not for sale.
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="For Sale: Price L$[PRICE]." v_pad="0" width="226">
-				Price: L$[PRICE] (L$[PRICE_PER_SQM]/sq.m.).
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-240" drop_shadow_visible="true" enabled="false" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="SalePending" v_pad="0" width="344" />
-			<button bottom="-244" enabled="true" follows="left|top" font="SansSerif"
-			     halign="center" height="20" label="Sell Land..."
-			     label_selected="Sell Land..." left="295" mouse_opaque="true"
-			     name="Sell Land..." scale_image="true" width="145" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-240" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="For sale to" v_pad="0" width="186">
-				For sale to: [BUYER]
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-260" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="Sell with landowners objects in parcel."
-			     v_pad="0" width="186">
-				Objects included in sale.
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-260" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="Selling with no objects in parcel." v_pad="0"
-			     width="186">
-				Objects not included in sale.
-			</text>
-			<button bottom="-248" enabled="true" follows="left|top" font="SansSerif"
-			     halign="center" height="20" label="Cancel Land Sale"
-			     label_selected="Cancel Land Sale" left="295" mouse_opaque="true"
-			     name="Cancel Land Sale" scale_image="true" width="145" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-284" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Claimed:" v_pad="0" width="92">
-				Claimed:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-284" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="DateClaimText" v_pad="0" width="186">
-				Tue Aug 15 13:47:25 2006
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-304" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="PriceLabel" v_pad="0" width="92">
-				Area:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-304" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="PriceText" v_pad="0" width="186">
-				4048 sq.m.
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-324" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Traffic:" v_pad="0" width="92">
-				Traffic:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-324" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="DwellText" v_pad="0" width="186">
-				0
-			</text>
-			<button bottom="-348" enabled="false" follows="left|top" font="SansSerif"
-			     halign="center" height="20" label="Buy Land..."
-			     label_selected="Buy Land..." left="155" mouse_opaque="true"
-			     name="Buy Land..." scale_image="true" width="100" />
-			<button bottom="-372" enabled="false" follows="left|top" font="SansSerif"
-			     halign="center" height="20" label="Buy For Group..."
-			     label_selected="Buy For Group..." left="260" mouse_opaque="true"
-			     name="Buy For Group..." scale_image="true" width="180" />
-			<button bottom="-372" enabled="false" follows="left|top" font="SansSerif"
-			     halign="center" height="20" label="Buy Pass..."
-			     label_selected="Buy Pass..." left="155" mouse_opaque="true"
-			     name="Buy Pass..." scale_image="true"
-			     tool_tip="A pass gives you temporary access to this land." width="100" />
-			<button bottom="-348" enabled="true" follows="left|top" font="SansSerif"
-			     halign="center" height="20" label="Abandon Land..."
-			     label_selected="Abandon Land..." left="260" mouse_opaque="true"
-			     name="Abandon Land..." scale_image="true" width="180" />
-			<button bottom="-300" enabled="true" follows="left|top" font="SansSerif"
-			     halign="center" height="20" label="Reclaim Land..."
-			     label_selected="Reclaim Land..." left="260" mouse_opaque="true"
-			     name="Reclaim Land..." scale_image="true" width="180" />
-			<button bottom="-324" enabled="false" follows="left|top" font="SansSerif"
-			     halign="center" height="20" label="Linden Sale..."
-			     label_selected="Linden Sale..." left="260" mouse_opaque="true"
-			     name="Linden Sale..." scale_image="true"
-			     tool_tip="Land must be owned, set content, and not already for auction."
-			     width="180" />
-			<string name="new users only">
-				New users only
-			</string>
-			<string name="anyone">
-				Anyone
-			</string>
-			<string name="area_text">
-				Area
-			</string>
-			<string name="area_size_text">
-				[AREA] sq.m.
-			</string>
-			<string name="auction_id_text">
-				Auction ID: [ID]
-			</string>
-			<string name="need_tier_to_modify">
-				You must approve your purchase to modify this land.
-			</string>
-			<string name="group_owned_text">
-				(Group Owned)
-			</string>
-			<string name="profile_text">
-				Profile...
-			</string>
-			<string name="info_text">
-				Info...
-			</string>
-			<string name="public_text">
-				(public)
-			</string>
-			<string name="none_text">
-				(none)
-			</string>
-			<string name="sale_pending_text">
-				(Sale Pending)
-			</string>
-			<string name="no_selection_text">
-			No parcel selected.
-Go to World menu > About Land or select another parcel to show its details.
-			</string>
-		</panel>
-		<panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" label="Covenant" left="0" mouse_opaque="true"
-		     name="land_covenant_panel" width="458">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerif" h_pad="0" halign="left" height="20" left="5"
-			     mouse_opaque="false" name="estate_section_lbl" v_pad="0" width="100">
-				Estate:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-			     mouse_opaque="false" name="estate_name_lbl" v_pad="0" width="100">
-				Name:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-			     mouse_opaque="false" name="estate_name_text" v_pad="0" width="150">
-				mainland
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-			     mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
-				Owner:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-			     mouse_opaque="false" name="estate_owner_text" v_pad="0" width="150">
-				(none)
-			</text>
-			<text_editor type="string" length="1" bottom="-175" embedded_items="false" enabled="false"
-			     follows="left|top|right|bottom" font="SansSerifSmall" height="115"
-			     left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"
-			     width="330" word_wrap="true">
-				There is no Covenant provided for this Estate.
-			</text_editor>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-250" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-			     mouse_opaque="false" name="covenant_timestamp_text" v_pad="0" width="250">
-				Last Modified Wed Dec 31 16:00:00 1969
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-270" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerif" h_pad="0" halign="left" height="20" left="5"
-			     mouse_opaque="false" name="region_section_lbl" v_pad="0" width="100">
-				Region:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-290" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-			     mouse_opaque="false" name="region_name_lbl" v_pad="0" width="100">
-				Name:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-290" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-			     mouse_opaque="false" name="region_name_text" v_pad="0" width="150">
-				leyla
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-310" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-			     mouse_opaque="false" name="region_landtype_lbl" v_pad="0" width="100">
-				Type:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-310" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-			     mouse_opaque="false" name="region_landtype_text" v_pad="0" width="150">
-				Mainland / Homestead
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-330" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-			     mouse_opaque="false" name="region_maturity_lbl" v_pad="0" width="100">
-				Rating:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-330" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-			     mouse_opaque="false" name="region_maturity_text" v_pad="0" width="150">
-				Adult
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-350" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-			     mouse_opaque="false" name="resellable_lbl" v_pad="0" width="100">
-				Resale:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-350" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-			     mouse_opaque="false" name="resellable_clause" v_pad="0" width="330">
-				Land in this region may not be resold.
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-370" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-			     mouse_opaque="false" name="changeable_lbl" v_pad="0" width="100">
-				Subdivide:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-380" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="30" left="120"
-			     mouse_opaque="false" name="changeable_clause" v_pad="0" width="330">
-				Land in this region may not be joined/subdivided.
-			</text>
-			<string name="can_resell">
-				Purchased land in this region may be resold.
-			</string>
-			<string name="can_not_resell">
-				Purchased land in this region may not be resold.
-			</string>
-			<string name="can_change">
-				Purchased land in this region may be joined or subdivided.
-			</string>
-			<string name="can_not_change">
-				Purchased land in this region may not be joined or subdivided.
-			</string>
-		</panel>
-		<panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" label="Objects" left="1" mouse_opaque="true"
-		     name="land_objects_panel" width="458">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="false"
-			     width="364">
-				Region Object Bonus Factor: [BONUS]
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Simulator primitive usage:" v_pad="0" width="364">
-				Simulator primitive usage:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-			     mouse_opaque="true" name="objects_available" v_pad="0" width="212">
-				[COUNT] out of [MAX] ([AVAILABLE] available)
-			</text>
-			<string name="objects_available_text">
-				[COUNT] out of [MAX] ([AVAILABLE] available)
-			</string>
-			<string name="objects_deleted_text">
-				[COUNT] out of [MAX] ([DELETED] will be deleted)
-			</string>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Primitives parcel supports:" v_pad="0"
-			     width="152">
-				Primitives parcel supports:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-			     mouse_opaque="true" name="object_contrib_text" v_pad="0" width="212">
-				[COUNT]
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Primitives on parcel:" v_pad="0" width="152">
-				Primitives on parcel:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-			     mouse_opaque="true" name="total_objects_text" v_pad="0" width="48">
-				[COUNT]
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="28"
-			     mouse_opaque="true" name="Owned by parcel owner:" v_pad="0" width="128">
-				Owned by parcel owner:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-			     mouse_opaque="true" name="owner_objects_text" v_pad="0" width="48">
-				[COUNT]
-			</text>
-			<button bottom="-100" enabled="false" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Show" label_selected="Show"
-			     mouse_opaque="true" name="ShowOwner" right="-190" scale_image="true"
-			     width="60" />
-			<button bottom="-100" enabled="false" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Return..." label_selected="Return..."
-			     mouse_opaque="true" name="ReturnOwner..." right="-60" scale_image="true"
-			     tool_tip="Return objects to their owners." width="119" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="28"
-			     mouse_opaque="true" name="Set to group:" v_pad="0" width="128">
-				Set to group:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-			     mouse_opaque="true" name="group_objects_text" v_pad="0" width="48">
-				[COUNT]
-			</text>
-			<button bottom="-120" enabled="false" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Show" label_selected="Show"
-			     mouse_opaque="true" name="ShowGroup" right="-190" scale_image="true"
-			     width="60" />
-			<button bottom="-120" enabled="false" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Return..." label_selected="Return..."
-			     mouse_opaque="true" name="ReturnGroup..." right="-60" scale_image="true"
-			     tool_tip="Return objects to their owners." width="119" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="28"
-			     mouse_opaque="true" name="Owned by others:" v_pad="0" width="128">
-				Owned by others:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-			     mouse_opaque="true" name="other_objects_text" v_pad="0" width="48">
-				[COUNT]
-			</text>
-			<button bottom="-140" enabled="false" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Show" label_selected="Show"
-			     mouse_opaque="true" name="ShowOther" right="-190" scale_image="true"
-			     width="60" />
-			<button bottom="-140" enabled="false" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Return..." label_selected="Return..."
-			     mouse_opaque="true" name="ReturnOther..." right="-60" scale_image="true"
-			     tool_tip="Return objects to their owners." width="119" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="28"
-			     mouse_opaque="true" name="Selected / sat upon:" v_pad="0" width="128">
-				Selected / sat upon:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-			     mouse_opaque="true" name="selected_objects_text" v_pad="0" width="48">
-				[COUNT]
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Autoreturn" v_pad="0" width="294">
-				Autoreturn other residents&apos; objects (minutes, 0 for off):
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-180"
-			     enabled="true" follows="left|top" font="SansSerifSmall"
-			     handle_edit_keys_directly="false" height="16" max_length="6"
-			     mouse_opaque="true" name="clean other time" right="-100"
-			     select_all_on_focus_received="false" select_on_focus="false" width="56" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-200" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Object Owners:" v_pad="0" width="104">
-				Object Owners:
-			</text>
-			<button bottom="-200" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Refresh List"
-			     label_selected="Refresh List" left="108" mouse_opaque="true"
-			     name="Refresh List" width="106" />
-			<button bottom="-200" enabled="false" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Return objects..."
-			     label_selected="Return objects..." left="220" mouse_opaque="true"
-			     name="Return objects..." width="164" />
-			<name_list allow_calling_card_drop="false" background_visible="true" bottom="-329"
-			     column_padding="0" draw_border="true" draw_heading="true"
-			     draw_stripes="true" enabled="true" 
-			     follows="left|top|right|bottom" height="117" left="4" mouse_opaque="true"
-			     multi_select="false" name="owner list" name_column_index="2" width="450">
-				<column name="type" label="Type" sort="online_status" width="24" />
-				<column name="online_status" width="-1" />
-				<column name="name" dynamicwidth="true" label="Name" />
-				<column name="count" label="Count" width="70" />
-				<column name="mostrecent" label="Most Recent" width="160" />
-			</name_list>
-		</panel>
-		<panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" label="Options" left="1" mouse_opaque="true"
-		     name="land_options_panel" width="458">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="allow_label" v_pad="0" width="278">
-				Allow other residents to:
-			</text>
-			<check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Edit Terrain" left="14"
-			     mouse_opaque="true" name="edit land check" radio_style="false"
-                             tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."
-                             width="268" />
-			<check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Create Landmarks" left="14"
-			     mouse_opaque="true" name="check landmark" radio_style="false" width="268" />
-			<check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Fly" left="14" mouse_opaque="true"
-			     name="check fly" radio_style="false"
-                             tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."
-                             width="268" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="178"
-			     mouse_opaque="true" name="allow_label2" v_pad="0" width="104">
-				Create Objects:
-			</text>
-			<check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="All Residents" left="270"
-			     mouse_opaque="true" name="edit objects check" radio_style="false"
-			     width="104" />
-			<check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Group" left="370"
-			     mouse_opaque="true" name="edit group objects check" radio_style="false"
-			     width="70" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="178"
-			     mouse_opaque="true" name="allow_label3" v_pad="0" width="124">
-				Object Entry:
-			</text>
-			<check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="All Residents" left="270"
-			     mouse_opaque="true" name="all object entry check" radio_style="false"
-			     width="120" />
-			<check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Group" left="370"
-			     mouse_opaque="true" name="group object entry check" radio_style="false"
-			     width="70" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="178"
-			     mouse_opaque="true" name="allow_label4" v_pad="0" width="124">
-				Run Scripts:
-			</text>
-			<check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="All Residents" left="270"
-			     mouse_opaque="true" name="check other scripts" radio_style="false"
-			     width="120" />
-			<check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Group" left="370"
-			     mouse_opaque="true" name="check group scripts" radio_style="false"
-			     width="70" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="land_options_label" v_pad="0" width="278">
-				Land Options:
-			</text>
-			<check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Safe (no damage)" left="14"
-			     mouse_opaque="true" name="check safe" radio_style="false"
-                             tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."
-                             width="268" />
-			<check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="No Pushing" left="178"
-			     mouse_opaque="true" name="PushRestrictCheck" radio_style="false"
-			     tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."
-			     width="119" />
-			<check_box bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false"
-			     label="Show Place in Search (L$30/week) under" left="14"
-			     mouse_opaque="true" name="ShowDirectoryCheck" radio_style="false"
-			     tool_tip="Let people see this parcel in search results" width="268" />
-			<string name="search_enabled_tooltip">
-				Let people see this parcel in search results
-			</string>
-			<string name="search_disabled_small_tooltip">
-				This option is disabled because this parcel&apos;s area is 128 sq.m. or smaller.
-Only large parcels can be listed in search.
-			</string>
-			<string name="search_disabled_permissions_tooltip">
-				This option is disabled because you cannot modify this parcel&apos;s options.
-			</string>
-			<combo_box allow_text_entry="false" bottom="-140" enabled="false" follows="left|top"
-			     height="18" left="255" max_chars="20" mouse_opaque="true"
-			     name="land category with adult" width="130" visible="false">
-				<combo_item name="AnyCategory" value="any">
-					Any Category
-				</combo_item>
-				<combo_item name="LindenLocation" value="linden">
-					Linden Location
-				</combo_item>
-				<combo_item name="Adult" value="adult">
-					Adult
-				</combo_item>
-				<combo_item name="Arts&amp;Culture" value="arts">
-					Arts &amp; Culture
-				</combo_item>
-				<combo_item name="Business" value="store">
-					Business
-				</combo_item>
-				<combo_item name="Educational" value="educational">
-					Educational
-				</combo_item>
-				<combo_item name="Gaming" value="game">
-					Gaming
-				</combo_item>
-				<combo_item name="Hangout" value="gather">
-					Hangout
-				</combo_item>
-				<combo_item name="NewcomerFriendly" value="newcomer">
-					Newcomer Friendly
-				</combo_item>
-				<combo_item name="Parks&amp;Nature" value="park">
-					Parks &amp; Nature
-				</combo_item>
-				<combo_item name="Residential" value="home">
-					Residential
-				</combo_item>
-				<combo_item name="Shopping" value="shopping">
-					Shopping
-				</combo_item>
-				<combo_item name="Other" value="other">
-					Other
-				</combo_item>
-			</combo_box>
-			<!-- The following combo box is identical to the previous one, except for the
-			fact that the Adult item is missing. This seems to be the only way to safely
-			delete the adult item with our UI toolkit.
-			Once we have completed the transition period, the one WITH adult can be deleted. -->
-			<combo_box allow_text_entry="false" bottom="-140" enabled="false" follows="left|top"
-			     height="18" left="255" max_chars="20" mouse_opaque="true"
-			     name="land category" width="130" visible="false">
-				<combo_item name="AnyCategory" value="any">
-					Any Category
-				</combo_item>
-				<combo_item name="LindenLocation" value="linden">
-					Linden Location
-				</combo_item>
-				<combo_item name="Arts&amp;Culture" value="arts">
-					Arts &amp; Culture
-				</combo_item>
-				<combo_item name="Business" value="store">
-					Business
-				</combo_item>
-				<combo_item name="Educational" value="educational">
-					Educational
-				</combo_item>
-				<combo_item name="Gaming" value="game">
-					Gaming
-				</combo_item>
-				<combo_item name="Hangout" value="gather">
-					Hangout
-				</combo_item>
-				<combo_item name="NewcomerFriendly" value="newcomer">
-					Newcomer Friendly
-				</combo_item>
-				<combo_item name="Parks&amp;Nature" value="park">
-					Parks &amp; Nature
-				</combo_item>
-				<combo_item name="Residential" value="home">
-					Residential
-				</combo_item>
-				<combo_item name="Shopping" value="shopping">
-					Shopping
-				</combo_item>
-				<combo_item name="Other" value="other">
-					Other
-				</combo_item>
-			</combo_box>
-			<button bottom="-140" enabled="true" follows="left|top" font="SansSerif"
-			     halign="center" height="16" label="?" label_selected="?" left="400"
-			     mouse_opaque="true" name="?" width="20" />
-			<check_box bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Mature Content" left="14"
-			     mouse_opaque="true" name="MatureCheck" radio_style="false"
-			     tool_tip=" "
-			     width="107" />
-			<string name="mature_check_mature">
-				Mature Content
-			</string>
-			<string name="mature_check_adult">
-				Adult Content
-			</string>
-			<string name="mature_check_mature_tooltip">
-				Your parcel information or content is considered mature.
-			</string>
-			<string name="mature_check_adult_tooltip">
-				Your parcel information or content is considered adult.
-			</string>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Snapshot:" v_pad="0" width="278">
-				Snapshot:
-			</text>
-			<texture_picker allow_no_texture="false" bottom="-299" can_apply_immediately="false"
-			     default_image_name="" enabled="true" follows="left|top" height="135"
-			     label="" left="76" mouse_opaque="true" name="snapshot_ctrl"
-			     tool_tip="Click to choose a picture" width="180" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-303" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="landing_point" v_pad="0" width="278">
-				Landing Point: [LANDING]
-			</text>
-			<string name="landing_point_none">
-				(none)
-			</string>
-			<button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Set" label_selected="Set" left="236"
-			     mouse_opaque="true" name="Set" scale_image="true"
-			     tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
-			     width="50" />
-			<button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Clear" label_selected="Clear" left="291"
-			     mouse_opaque="true" name="Clear" scale_image="true"
-			     tool_tip="Clear the landing point." width="50" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-323" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Teleport Routing: " v_pad="0" width="278">
-				Teleport Routing:
-			</text>
-			<combo_box allow_text_entry="false" bottom="-325" enabled="true" follows="left|top"
-			     height="18" left="120" max_chars="20" mouse_opaque="true"
-			     name="landing type"
-			     tool_tip="Teleport Routing -- select how to handle teleports onto your land."
-			     width="120">
-				<combo_item type="string" length="1" enabled="true" name="Blocked" value="Blocked">
-					Blocked
-				</combo_item>
-				<combo_item type="string" length="1" enabled="true" name="LandingPoint" value="Landing Point">
-					Landing Point
-				</combo_item>
-				<combo_item type="string" length="1" enabled="true" name="Anywhere" value="Anywhere">
-					Anywhere
-				</combo_item>
-			</combo_box>
-			<string name="push_restrict_text">
-				No Pushing
-			</string>
-			<string name="push_restrict_region_text">
-				No Pushing (Region Override)
-			</string>
-		</panel>
-		<panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="363" label="Media" left="1" mouse_opaque="true"
-		     name="land_media_panel" width="458">
-			<text type="string" length="1" bottom="-25" follows="left|top" font="SansSerifSmall" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="with media:" width="65">
-				Media Type:
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="0" follows="left|top" height="18"
-			     left="80" max_chars="20" name="media type"
-			     tool_tip="Specify if the URL is a movie, web page, or other media"
-			     width="120" />
-			<text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-			     left_delta="130" name="mime_type" width="200" />
-			<text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-			     height="16" left="10" name="at URL:" width="65">
-				Media URL:
-			</text>
-			<line_editor bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" left="80"
-			     max_length="255" name="media_url" right="-80"
-			     select_all_on_focus_received="true" select_on_focus="true"
-			     text_readonly_color="0.576471 0.662745 0.835294 1" />
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" label="Set..." label_selected="Set..." mouse_opaque="true"
-			     name="set_media_url" right="-12" scale_image="true" width="60" />
-			<text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-			     height="16" left="10" name="Description:" width="364">
-				Description:
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-			     follows="left|top" font="SansSerifSmall" height="16" left="80"
-			     max_length="255" name="url_description" right="-80"
-			     select_all_on_focus_received="true" select_on_focus="true"
-			     tool_tip="Text displayed next to play/load button" />
-			<text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-			     height="16" left="10" name="Media texture:" width="364">
-				Replace
-Texture:
-			</text>
-			<texture_picker allow_no_texture="true" bottom_delta="-64" can_apply_immediately="false"
-			     default_image_name="Default" follows="left|top" height="80" label=""
-			     left="80" name="media texture" tool_tip="Click to choose a picture"
-			     width="64" />
-			<text type="string" length="1" bottom_delta="48" follows="left|top" font="SansSerifSmall" halign="left"
-			     height="16" left_delta="75" name="replace_texture_help" width="270">
-				(Objects using this texture will show the movie or
-web page after you click the play arrow.)
-			</text>
-			<text type="string" length="1" bottom_delta="-55" follows="left|top" font="SansSerifSmall" halign="left"
-			     height="16" left="10" mouse_opaque="true" name="Options:" width="292">
-				Media
-Options:
-			</text>
-			<check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Auto scale" left="80"
-			     mouse_opaque="true" name="media_auto_scale" radio_style="false"
-			     tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
-			     width="200" />
-			<check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Loop Media" left="250"
-			     mouse_opaque="true" name="media_loop" radio_style="false"
-			     tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."
-			     width="200" />
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Hide Media URL" left="80"
-			     mouse_opaque="true" name="hide_media_url" radio_style="false"
-			     tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types."
-			     width="200" />
-			<check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Hide Music URL" left="250"
-			     mouse_opaque="true" name="hide_music_url" radio_style="false"
-			     tool_tip="Checking this option will hide the music url to any non-authorized viewers of this parcel information"
-			     width="200" />
-			<text type="string" length="1" bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="left"
-			     height="16" left="85" name="media_size"
-			     tool_tip="Size to render Web media, leave 0 for default." width="85">
-				Media size:
-			</text>
-			<spinner bottom_delta="0" decimal_digits="0" enabled="false" follows="left|top"
-			     halign="right" height="16" increment="1" initial_val="0" left_delta="65"
-			     max_val="1024" min_val="0" name="media_size_width"
-			     tool_tip="Size to render Web media, leave 0 for default." width="64" />
-			<spinner bottom_delta="0" decimal_digits="0" enabled="false" follows="left|top"
-			     halign="right" height="16" increment="1" initial_val="0" left_delta="80"
-			     max_val="1024" min_val="0" name="media_size_height"
-			     tool_tip="Size to render Web media, leave 0 for default." width="64" />
-			<text type="string" length="1" bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="left"
-			     height="16" left_delta="70" name="pixels" right="-10">
-				pixels
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-40" drop_shadow_visible="true" enabled="true"
-			     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="16" left="10" mouse_opaque="true" name="MusicURL:" v_pad="0"
-			     width="364">
-				Music URL:
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-			     enabled="true" follows="left|top" font="SansSerifSmall"
-			     handle_edit_keys_directly="false" height="16" left="80" max_length="255"
-			     mouse_opaque="true" name="music_url" right="-15"
-			     select_all_on_focus_received="true" select_on_focus="true"/>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-40" drop_shadow_visible="true" enabled="true"
-			     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="16" left="10" mouse_opaque="true" name="Sound:" v_pad="0"
-			     width="364">
-				Sound:
-			</text>
-			<check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false"
-			     label="Restrict gesture and object sounds to this parcel" left="80"
-			     mouse_opaque="true" name="check sound local" radio_style="false"
-			     width="292" />
-                      	<button bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="18" label="?" label_selected="?" left="372"
-                             mouse_opaque="true" name="?" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-40" enabled="true" follows="left|top" font="SansSerifSmall"
-			     h_pad="0" halign="left" height="16" left="10" mouse_opaque="false"
-			     name="Voice settings:" tab_stop="false" v_pad="0" width="364">
-				Voice:
-			</text>
-                        <check_box bottom_delta="-0" enabled="true" follows="left|top"
-                             height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel"
-                             tab_stop="true" width="463"
-                             label="Enable Voice"
-                        />
-                        <check_box bottom_delta="-0" enabled="false" follows="left|top"
-                             height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel_is_estate_disabled"
-                             tab_stop="true" width="463"
-                             label="Enable Voice (established by the Estate)"
-                        />
-                        <check_box bottom_delta="-20" enabled="true" follows="left|top"
-                             height="54" left="100" mouse_opaque="true" name="parcel_enable_voice_channel_parcel"
-                             tab_stop="true" width="443"
-                             label="Restrict Voice to this parcel"
-                        />
-		</panel>
-		<panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" label="Access" left="1" mouse_opaque="true"
-		     name="land_access_panel" width="458">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerif" h_pad="0" halign="left" height="20" left="8"
-			     mouse_opaque="true" name="Limit access to this parcel to:" v_pad="0"
-			     width="278">
-				Access To This Parcel
-			</text>
-			<check_box bottom="-45" enabled="true" follows="top|left" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Allow Public Access" left="8"
-			     mouse_opaque="true" name="public_access" radio_style="false" width="278" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" enabled="true"
-			     follows="top|left" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="16" left_delta="20" mouse_opaque="true" name="Only Allow" v_pad="0"
-			     width="278">
-				Block Access By:
-			</text>
-			<check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
-			     height="16" initial_value="false"
-			     label="Residents who have not given payment info to Linden Lab"
-			     left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false"
-			     tool_tip="Ban unidentified residents." width="278" />
-			<check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
-			     height="16" initial_value="false"
-			     label="Residents who are not age verified adults" left_delta="0"
-			     mouse_opaque="true" name="limit_age_verified" radio_style="false"
-			     tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."
-			     width="278" />
-			<string name="estate_override">
-				One or more of these options is set at the estate level
-			</string>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Allow Group Access: [GROUP]"
-			     left="8" mouse_opaque="true" name="GroupCheck" radio_style="false"
-			     tool_tip="Set group in the General tab." width="278" />
-			<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Sell passes to:" left="8"
-			     mouse_opaque="true" name="PassCheck" radio_style="false"
-			     tool_tip="Allows temporary access to this parcel" width="120" />
-			<combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
-			     height="16" left_delta="142" max_chars="20" mouse_opaque="true"
-			     name="pass_combo" width="100">
-				<combo_item name="Anyone" value="anyone">
-					Anyone
-				</combo_item>
-				<combo_item name="Group" value="group">
-					Group
-				</combo_item>
-			</combo_box>
-			<spinner bottom_delta="-20" enabled="false" follows="left|top" height="16" increment="1"
-			     initial_val="10" label="Price in L$:" label_width="120" left="28"
-			     max_val="500" min_val="1" mouse_opaque="true" name="PriceSpin" width="180" />
-			<spinner bottom_delta="-20" enabled="false" follows="left|top" height="16"
-			     increment="0.25" initial_val="1" label="Hours of access:" label_width="120"
-			     left_delta="0" max_val="24" min_val="0.01" mouse_opaque="true"
-			     name="HoursSpin" width="180" />
-			<text bottom="-220" enabled="true" follows="left|right|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="Always Allow" left="20"
-			     mouse_opaque="true" name="AllowedText" radio_style="false" width="195">
-				Allowed Residents
-			</text>
-			<name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
-			     column_padding="0" draw_border="true" draw_heading="false" enabled="true"
-			     follows="top|bottom" heading_font="SansSerifSmall" heading_height="14"
-			     height="80" left="20" mouse_opaque="true" multi_select="true"
-			     name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" width="195" />
-			<button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
-			     halign="center" height="16" label="Add..." label_selected="Add..."
-			     left_delta="5" mouse_opaque="true" name="add_allowed" scale_image="true"
-			     width="80" />
-			<button bottom_delta="0" enabled="true" follows="bottom" font="SansSerifSmall"
-			     halign="center" height="16" label="Remove" label_selected="Remove"
-			     left_delta="100" mouse_opaque="true" name="remove_allowed"
-			     scale_image="true" width="80" />
-			<text bottom="-220" enabled="true" follows="left|right|top" font="SansSerifSmall"
-			     height="16" initial_value="false"
-			     label="Ban" left="240" mouse_opaque="true"
-			     name="BanCheck" radio_style="false" width="195">
-			  Banned Residents
-			</text>
-			<name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
-			     column_padding="0" draw_border="true" draw_heading="false" enabled="true"
-			     follows="top|bottom" heading_font="SansSerifSmall"
-			     heading_height="14" height="80" left_delta="0" mouse_opaque="true"
-			     multi_select="true" name="BannedList"
-			     tool_tip="([LISTED] listed, [MAX] max)" width="195" />
-			<button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
-			     halign="center" height="16" label="Add..." label_selected="Add..."
-			     left_delta="5" mouse_opaque="true" name="add_banned" scale_image="true"
-			     width="80" />
-			<button bottom_delta="0" enabled="false" follows="bottom" font="SansSerifSmall"
-			     halign="center" height="16" label="Remove" label_selected="Remove"
-			     left_delta="100" mouse_opaque="true" name="remove_banned"
-			     scale_image="true" width="80" />
-		</panel>
-	</tab_container>
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
deleted file mode 100644
index af8db95..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
+++ /dev/null
@@ -1,701 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
-     name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
-     width="780">
-	<tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
-	     mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="All" left="1" mouse_opaque="false" name="find_all_panel" width="778">
-			<string name="searching_text">
-				Searching...
-			</string>
-			<string name="not_found_text">
-				None Found.
-			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     commit_on_focus_lost="false" enabled="true" follows="top|left|right"
-			     font="SansSerif" handle_edit_keys_directly="false" height="18"
-			     label="Search" left_delta="56" max_length="254" mouse_opaque="true"
-			     name="search_editor" select_all_on_focus_received="false"
-			     select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
-			     width="160" />
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
-			     left="230" name="back_btn" width="70" />
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-			     label="Forward" left="304" name="forward_btn" width="70" />
-			<button bottom="-48" follows="top|right" font="SansSerif" height="20"
-			     label="Search" left="121" name="search_btn" width="95" />
-			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18"
-			     left="230" max_chars="20" mouse_opaque="true" name="Category"
-			     width="158">
-				<combo_item name="AnyCategory" value="All">
-					Any Category
-				</combo_item>
-				<combo_item name="Events" value="Events">
-					Events
-				</combo_item>
-				<combo_item name="Groups" value="Groups">
-					Groups
-				</combo_item>
-				<combo_item name="People" value="People">
-					People
-				</combo_item>
-				<combo_item name="Places" value="Places">
-					Places
-				</combo_item>
-				<combo_item name="Wiki" value="Wiki">
-					Wiki
-				</combo_item>
-			</combo_box>
-			<check_box bottom="-22" control_name="ShowPGSearchAll" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureSearchAll" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultSearchAll" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<button bottom="-22" enabled="true" follows="right|top" font="SansSerif"
-                             halign="center" height="18" label="?" label_selected="?" left="-25"
-                             mouse_opaque="true" name="?" width="18" />
-			<web_browser bottom="25" follows="top|left|bottom|right" font="SansSerifSmall" left="10"
-			     name="find_browser" right="-10" top="-60" />
-			<text bottom="5" follows="bottom|left" halign="left" height="16" left="10"
-			     name="status_text" width="150" />
-			<string name="loading_text">
-				Loading...
-			</string>
-			<string name="done_text">
-				Done
-			</string>
-			<string name="redirect_404_url">
-				http://secondlife.com/app/search/notfound.html
-			</string>
-      <string name="default_search_page">"http://secondlife.com/app/search/index.php?"</string>
-    </panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
-		     name="classified_panel" width="778">
-			<string name="searching_text">
-				Searching...
-			</string>
-			<string name="not_found_text">
-				None Found.
-			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="name" width="160" />
-			<check_box bottom="-22" control_name="ShowPGClassifieds" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureClassifieds" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultClassifieds" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="Category" width="158">
-				<combo_item name="AnyCategory" value="0">
-					Any Category
-				</combo_item>
-				<combo_item name="Shopping" value="1">
-					Shopping
-				</combo_item>
-				<combo_item name="LandRental" value="2">
-					Land Rental
-				</combo_item>
-				<combo_item name="PropertyRental" value="3">
-					Property Rental
-				</combo_item>
-				<combo_item name="SpecialAttraction" value="4">
-					Special Attraction
-				</combo_item>
-				<combo_item name="NewProducts" value="5">
-					New Products
-				</combo_item>
-				<combo_item name="Employment" value="6">
-					Employment
-				</combo_item>
-				<combo_item name="Wanted" value="7">
-					Wanted
-				</combo_item>
-				<combo_item name="Service" value="8">
-					Service
-				</combo_item>
-				<combo_item name="Personal" value="9">
-					Personal
-				</combo_item>
-			</combo_box>
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Browse" label_selected="Browse" left="121" mouse_opaque="true"
-			     name="Browse" width="95" />
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
-			     visible="false" width="95" />
-			<button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Place an Ad..." label_selected="Place an Ad..." left="630"
-			     mouse_opaque="true" name="Place an Ad..." width="145" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Delete" label_selected="Delete" left="80"
-			     mouse_opaque="true" name="Delete" width="80" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" 
-				 draw_heading="true" follows="left|top|right|bottom" height="450" left="4" 
-				 mouse_opaque="true" multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column label="Name" name="name" width="225" />
-				<column label="Price" name="price" width="55" />
-			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="80" />
-			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
-		</panel>
-		<panel border="true" bottom="-549" default_tab_group="1"
-		     follows="left|top|right|bottom" height="533" label="Events" left="1"
-		     mouse_opaque="false" name="events_panel" width="778">
-			<string name="searching_text">
-				Searching...
-			</string>
-			<string name="not_found_text">
-				None Found.
-			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="text2" v_pad="0" width="50">
-				Find:
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="event_search_text" width="160" />
-			<radio_group bottom="-40" draw_border="false" follows="right|top" height="40" left="560"
-			     mouse_opaque="true" name="date_mode" width="300">
-				<radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
-				     name="current" width="174">
-					In-Progress and Upcoming
-				</radio_item>
-				<radio_item bottom_delta="-10" follows="left|top" height="20" left="0" mouse_opaque="true"
-				     name="date" width="56">
-					Date
-				</radio_item>
-			</radio_group>
-			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="&lt;&lt;" label_selected="&lt;&lt;" left_delta="54"
-			     mouse_opaque="true" name="&lt;&lt;" tool_tip="Go back a day" width="24" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-36" drop_shadow_visible="true" follows="right|top" font="SansSerif"
-			     h_pad="0" halign="center" height="14" left_delta="22" mouse_opaque="true"
-			     name="date_text" v_pad="0" width="48">
-				6/6
-			</text>
-			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="&gt;&gt;" label_selected="&gt;&gt;" left_delta="50"
-			     mouse_opaque="true" name="&gt;&gt;" tool_tip="Go forward a day" width="24" />
-			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Today" label_selected="Today" left_delta="28" mouse_opaque="true"
-			     name="Today" tool_tip="Show today&apos;s events" width="60" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
-			     mouse_opaque="true" name="text" v_pad="0" width="90" visible="false">
-				Category:
-			</text>
-			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="category combo" width="158">
-				<combo_item name="All" value="0">
-					Any Category
-				</combo_item>
-				<combo_item name="Discussion" value="18">
-					Discussion
-				</combo_item>
-				<combo_item name="Sports" value="19">
-					Sports
-				</combo_item>
-				<combo_item name="LiveMusic" value="20">
-					Live Music
-				</combo_item>
-				<combo_item name="Commercial" value="22">
-					Commercial
-				</combo_item>
-				<combo_item name="Nightlife/Entertainment" value="23">
-					Nightlife/Entertainment
-				</combo_item>
-				<combo_item name="Games/Contests" value="24">
-					Games/Contests
-				</combo_item>
-				<combo_item name="Pageants" value="25">
-					Pageants
-				</combo_item>
-				<combo_item name="Education" value="26">
-					Education
-				</combo_item>
-				<combo_item name="ArtsandCulture" value="27">
-					Arts and Culture
-				</combo_item>
-				<combo_item name="Charity/SupportGroups" value="28">
-					Charity/Support Groups
-				</combo_item>
-				<combo_item name="Miscellaneous" value="29">
-					Miscellaneous
-				</combo_item>
-			</combo_box>
-			<check_box bottom="-22" control_name="ShowPGEvents" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureEvents" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultEvents" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
-			     visible="true" width="95" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Delete" label_selected="Delete" left="80"
-			     mouse_opaque="true" name="Delete" width="80" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column label="Time (PT)" name="date" sort="time" width="106" />
-				<column label="" name="event_id" width="-1" />
-				<column label="Time" name="time" width="-1" />
-			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="80" />
-			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
-		</panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Showcase" left="1" mouse_opaque="false" name="showcase_panel"
-		     width="778">
-        <string name="searching_text">Searching...</string>
-        <string name="not_found_text">None Found.</string>
-        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="20"
-          label="Back"
-          left="10"
-          name="back_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-          label="Forward" left_delta="75"
-          name="forward_btn" width="70" />
-        <!-- No mature content checkbox, showcase is all PG -->
-        <web_browser name="showcase_browser"
-          bottom="25"
-          follows="top|left|bottom|right"
-          font="SansSerifSmall"
-          left="10"
-          right="-10"
-          top="-40" />
-        <text bottom="5"
-          follows="bottom|left"
-          halign="left"
-          left="10"
-          width="150"
-          name="status_text"
-          height="16" />
-        <string name="loading_text">Loading...</string>
-        <string name="done_text">Done</string>
-        <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
-        <string name="default_search_page">"http://secondlife.com/app/showcase/index.php?"</string>
-    </panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
-		     width="778" default_tab_group="1">
-			<string name="searching_text">
-				Searching...
-			</string>
-			<string name="not_found_text">
-				None Found.
-			</string>
-			<string name="land_help_text">
-				Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
-To buy direct, visit the land and click on the place name in the title bar.
-			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
-			</text>
-			<check_box bottom="-22" control_name="ShowPGLand" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" tab_group="7" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureLand" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" tab_group="8" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultLand" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" tab_group="9" width="156" />
-			<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
-			     max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
-				<combo_item name="AllTypes" value="All Types">
-					All Types
-				</combo_item>
-				<combo_item name="Auction" value="Auction">
-					Auction
-				</combo_item>
-				<combo_item name="MainlandSales" value="Mainland Sales">
-					For Sale - Mainland
-				</combo_item>
-				<combo_item name="EstateSales" value="Estate Sales">
-					For Sale - Estate
-				</combo_item>
-			</combo_box>
-			<check_box bottom="-24" control_name="FindLandPrice" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Price &#8804; " left="56" mouse_opaque="true" name="pricecheck"
-			     tab_group="1" width="88" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
-			     bottom="-24" font="SansSerifSmall" halign="left" height="16" left="116" mouse_opaque="true"
-			     name="pricecheck_symbol" width="15">
-				L$
-			</text>
-			<check_box bottom_delta="-18" control_name="FindLandArea" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Area &#8805; " left="56" mouse_opaque="true" name="areacheck"
-			     tab_group="3" width="80" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
-			     bottom="-42" font="SansSerifSmall" halign="left" height="16" left="170" mouse_opaque="true"
-			     name="areacheck_symbol" width="15">
-				m²
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
-			     follows="left|top" font="SansSerifSmall" height="16" left="132"
-			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
-			     follows="left|top" font="SansSerifSmall" height="16" left="117"
-			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" />
-			<button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="208" mouse_opaque="true"
-			     name="Search" tab_group="5" width="70" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" tab_group="10" width="387">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column label="Type" name="landtype" width="50" />
-				<column label="L$ Price" name="price" width="65" />
-				<column label="Area" name="area" width="50" />
-				<column label="L$/m²" name="per_meter" width="65" />
-			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
-		</panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Places" left="1" mouse_opaque="false" name="places_panel"
-		     width="778">
-			<string name="searching_text">
-				Searching...
-			</string>
-			<string name="not_found_text">
-				None Found.
-			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="name" width="160" />
-			<check_box bottom="-22" control_name="ShowPGSims" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureSims" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultSims" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
-				<combo_item name="AnyCategory" value="any">
-					Any Category
-				</combo_item>
-				<combo_item name="LindenLocation" value="linden">
-					Linden Location
-				</combo_item>
-				<combo_item name="Arts&amp;Culture" value="arts">
-					Arts &amp; Culture
-				</combo_item>
-				<combo_item name="Business" value="store">
-					Business
-				</combo_item>
-				<combo_item name="Educational" value="educational">
-					Educational
-				</combo_item>
-				<combo_item name="Gaming" value="game">
-					Gaming
-				</combo_item>
-				<combo_item name="Hangout" value="gather">
-					Hangout
-				</combo_item>
-				<combo_item name="NewcomerFriendly" value="newcomer">
-					Newcomer Friendly
-				</combo_item>
-				<combo_item name="Parks&amp;Nature" value="park">
-					Parks &amp; Nature
-				</combo_item>
-				<combo_item name="Residential" value="home">
-					Residential
-				</combo_item>
-				<combo_item name="Shopping" value="shopping">
-					Shopping
-				</combo_item>
-				<combo_item name="Other" value="other">
-					Other
-				</combo_item>
-			</combo_box>
-			<!-- This is used only during the AO transition and can be deleted once the AO transition is
-			complete. It is identical to the combo box above except that it has the Adult category. 
-			You might also want to set it back to default visible and enabled. -->
-			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="Category_Adult" width="128" visible="false">
-				<combo_item name="AnyCategory" value="any">
-					Any Category
-				</combo_item>
-				<combo_item name="LindenLocation" value="linden">
-					Linden Location
-				</combo_item>
-				<combo_item name="Adult" value="adult">
-					Adult
-				</combo_item>
-				<combo_item name="Arts&amp;Culture" value="arts">
-					Arts &amp; Culture
-				</combo_item>
-				<combo_item name="Business" value="store">
-					Business
-				</combo_item>
-				<combo_item name="Educational" value="educational">
-					Educational
-				</combo_item>
-				<combo_item name="Gaming" value="game">
-					Gaming
-				</combo_item>
-				<combo_item name="Hangout" value="gather">
-					Hangout
-				</combo_item>
-				<combo_item name="NewcomerFriendly" value="newcomer">
-					Newcomer Friendly
-				</combo_item>
-				<combo_item name="Parks&amp;Nature" value="park">
-					Parks &amp; Nature
-				</combo_item>
-				<combo_item name="Residential" value="home">
-					Residential
-				</combo_item>
-				<combo_item name="Shopping" value="shopping">
-					Shopping
-				</combo_item>
-				<combo_item name="Other" value="other">
-					Other
-				</combo_item>
-			</combo_box>
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
-			     name="Search" width="95" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-			     draw_heading="true" 
-			     
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column label="Traffic" name="dwell" width="75" />
-			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
-		</panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="People" left="1" mouse_opaque="false" name="people_panel"
-		     width="778">
-			<string name="searching_text">
-				Searching...
-			</string>
-			<string name="not_found_text">
-				None Found.
-			</string>
-      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-        Find:
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="name" width="160" />
-		<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
-			     name="Search" width="95" />
-      <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-			     draw_heading="true"
-                               
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="326">
-        <column label="" name="icon" width="24" />
-        <column label="" name="type" width="-1" />
-        <column label="Name" name="name" width="274" />
-      </scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="330" width="80" />
-      		<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
-		</panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Groups" left="1" mouse_opaque="false"
-		     name="groups_panel"
-		     width="778">
-      <string name="searching_text">Searching...</string>
-      <string name="not_found_text">None Found.</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
-			</text>
-      <line_editor bevel_style="in"
-						border_style="line"
-						border_thickness="1"
-						bottom="-24"
-						enabled="true"
-						follows="top|left|right"
-						font="SansSerif"
-						handle_edit_keys_directly="false"
-						commit_on_focus_lost="false"
-						height="18"
-						hidden="false"
-						label="Search"
-						left_delta="56"
-						width="160"
-						max_length="254"
-						mouse_opaque="true"
-						name="search_editor"
-						select_all_on_focus_received="false"
-						select_on_focus="false"
-						tab_group="1"
-						tool_tip="Search Second Life" />
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
-			     left="230" name="back_btn" width="70" />
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-			     label="Forward" left="304" name="forward_btn" width="70" />
-			<button bottom="-48" follows="top|right" font="SansSerif" height="20"
-			     label="Search" left="121" name="search_btn" width="95" />
-	  <check_box bottom="-22" control_name="ShowPGGroups" follows="right|top"
-		     font="SansSerifSmall" height="16" initial_value="true"
-		     label="PG content" left="420" mouse_opaque="true"
-		     name="incpg" width="156" />
-	  <check_box bottom="-40" control_name="ShowMatureGroups" follows="right|top"
-		     font="SansSerifSmall" height="16" initial_value="true"
-		     label="Mature content" left="420" mouse_opaque="true"
-		     name="incmature" width="156" />
-	  <check_box bottom="-58" control_name="ShowAdultGroups" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-		     label="Adult content" left="420" mouse_opaque="true"
-		     name="incadult" width="156" />
-      <web_browser name="groups_browser"
-				bottom="25"
-				follows="top|left|bottom|right"
-				font="SansSerifSmall"
-				left="10"
-				right="-10"
-				top="-60" />
-      <text bottom="5"
-				follows="bottom|left"
-				halign="left"
-				left="10"
-				width="150"
-				name="status_text"
-				height="16" />
-      <string name="loading_text">Loading...</string>
-      <string name="done_text">Done</string>
-      <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
-      <string name="default_search_page">"http://secondlife.com/app/search/index_groups.php?"</string>
-    </panel>
-	</tab_container>
-	<panel bottom="-560" follows="right|top" height="470" left="340"
-	     name="classified_details_panel" width="440" />
-	<panel bottom="-560" follows="right|top" height="486" left="350" name="Panel Avatar"
-	     width="430" />
-	<panel bottom="-560" follows="right|top" height="470" left="340"
-	     name="event_details_panel" width="440" />
-	<panel bottom="-580" follows="right|top" height="515" left="350"
-	     name="group_details_panel_holder" width="430">
-		<panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
-		     width="430" />
-	</panel>
-	<panel bottom="5" follows="right|top" height="470" left="340"
-	     name="place_details_panel" width="440" />
-	<panel bottom="0" follows="right|top" height="470" left="385"
-	     name="place_details_small_panel" width="395" />
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_env_settings.xml
deleted file mode 100644
index e2bafbf..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_env_settings.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-130" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="150" left="50" min_height="150"
-     min_width="600" mouse_opaque="true" name="Environment Editor Floater"
-     rect_control="FloaterEnvRect" title="Environment Editor" width="600">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-48" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16" 
-	     left="10" mouse_opaque="true" name="EnvTimeText" v_pad="0" width="140">
-		Time of Day
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-30" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" 
-	     left="15" mouse_opaque="true" name="EnvTimeText2" v_pad="0" width="140">
-		12:00 PM
-	</text>
-	<icon bottom="-55" follows="left|top" height="25" image_name="icon_diurnal.tga"
-	     left="85" name="EnvDayCycle" width="200" />
-	<slider bottom_delta="-20" can_edit_text="false" control_name="EnvTimeSlider"
-	     decimal_digits="2" follows="left" height="10" increment="0.0069444"
-	     initial_val="0.7" label="" left_delta="0" max_val="0.99" min_val="0"
-	     mouse_opaque="true" name="EnvTimeSlider" show_text="false" value="0.0"
-	     width="200" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16" 
-	     left="10" mouse_opaque="true" name="EnvCloudText" v_pad="0" width="140">
-		Cloud Cover
-	</text>
-	<slider bottom="-100" can_edit_text="false" control_name="EnvCloudSlider"
-	     decimal_digits="2" follows="left" height="10" increment="0.01"
-	     initial_val="0.7" label="" left="85" max_val="1" min_val="0"
-	     mouse_opaque="true" name="EnvCloudSlider" show_text="true" value="0.7"
-	     width="210" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16" 
-	     left="310" mouse_opaque="true" name="EnvWaterColorText" v_pad="0"
-	     width="140">
-		Water Color
-	</text>
-	<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
-	     can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-	     height="50" label="" left="390" mouse_opaque="true"
-	     name="EnvWaterColor" tool_tip="Click to open Color Picker" width="40" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16" 
-	     left="310" mouse_opaque="true" name="EnvWaterFogText" v_pad="0" width="140">
-		Water Fog
-	</text>
-	<slider bottom="-100" can_edit_text="false" control_name="EnvWaterFogSlider"
-	     decimal_digits="2" follows="left" height="10" increment="0.1"
-	     initial_val="0" label="" left="385" max_val="10" min_val="0"
-	     mouse_opaque="true" name="EnvWaterFogSlider" show_text="true" value="0"
-	     width="210" />
-	<button bottom="-140" follows="left|top" font="SansSerifSmall" height="20"
-	     label="Use Estate Time" left="8" name="EnvUseEstateTimeButton" width="137" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-	     label="Advanced Sky" left="154" name="EnvAdvancedSkyButton" width="137" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-	     label="Advanced Water" left="300" name="EnvAdvancedWaterButton" width="137" />
-	<button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
-	     left="570" name="EnvSettingsHelpButton" width="22" />
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
deleted file mode 100644
index f50bb65..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-668" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" follows="left|top" height="550" left="306"
-     min_height="271" min_width="290" mouse_opaque="true" name="script ed float"
-     rect_control="FloaterOpenObjectRect" title="Script: New Script" width="500">
-	<button bottom="-545" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Reset" label_selected="Reset" left="362"
-	     mouse_opaque="true" name="Reset" width="128" />
-	<check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
-	     height="18" initial_value="true" label="Running" left="12"
-	     mouse_opaque="true" name="running" radio_style="false" width="100" />
-	<panel bottom="-524" enabled="true" follows="left|top|right|bottom" height="506"
-	     left="1" name="script ed panel" width="497" />
-	<check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
-	     height="18" hidden="false" initial_value="true" label="Mono" left="82"
-	     mouse_opaque="true" name="mono" radio_style="false" width="100" />
-	<string name="not_allowed">
-		You are not allowed to view this script.
-	</string>
-	<string name="script_running">
-		Running
-	</string>
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_water.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_water.xml
deleted file mode 100644
index 5b65837..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_water.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="240" left="50" min_height="200"
-     min_width="400" mouse_opaque="true" name="Water Floater"
-     rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"
-     width="700">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
-	     width="110">
-		Water Presets:
-	</text>
-	<combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
-	     left_delta="110" max_chars="20" mouse_opaque="true"
-	     name="WaterPresetsCombo" width="150" />
-	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="New" label_selected="New" left_delta="170"
-	     mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Save" label_selected="Save" left_delta="80"
-	     mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Delete" label_selected="Delete" left_delta="80"
-	     mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
-	<tab_container bottom="-240" follows="left|top" height="180" left="0"
-	     mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
-		<panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-		     label="Settings" left="1" mouse_opaque="false"
-		     name="Settings" width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-				Water Fog Color
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="160" name="WaterFogColorHelp" width="18" />
-			<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
-			     can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-			     height="50" label="" left="40" mouse_opaque="true"
-			     name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-90" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">
-				Fog Density Exponent
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="160" name="WaterFogDensityHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity"
-			     decimal_digits="1" follows="left" height="10" increment=".1"
-			     initial_val="16" label="" left="24" max_val="10" min_val="0"
-			     mouse_opaque="true" name="WaterFogDensity" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-130" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"
-			     width="355">
-				Underwater Fog Modifier
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="160" name="WaterUnderWaterFogModHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2"
-			     follows="left" height="10" increment=".01" initial_val="16" label=""
-			     left="24" max_val="2" min_val="0" mouse_opaque="true"
-			     name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
-				Reflection Wavelet Scale
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="395" name="WaterNormalScaleHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-				1
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-				2
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-				3
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WaterNormalScaleX"
-			     decimal_digits="1" follows="left" height="10" increment="0.1"
-			     initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-			     mouse_opaque="true" name="WaterNormalScaleX" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleY"
-			     decimal_digits="1" follows="left" height="10" increment="0.1"
-			     initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-			     mouse_opaque="true" name="WaterNormalScaleY" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleZ"
-			     decimal_digits="1" follows="left" height="10" increment="0.1"
-			     initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-			     mouse_opaque="true" name="WaterNormalScaleZ" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-80" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
-				Fresnel Scale
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="395" name="WaterFresnelScaleHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WaterFresnelScale" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-115" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"
-			     width="355">
-				Fresnel Offset
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="395" name="WaterFresnelOffsetHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WaterFresnelOffset" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
-				Refract Scale Above
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="630" name="WaterScaleAboveHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.1" label="" left="494" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WaterScaleAbove" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"
-			     width="355">
-				Refract Scale Below
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="630" name="WaterScaleBelowHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0" label="" left="494" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WaterScaleBelow" show_text="true" value="0.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
-				Blur Multiplier
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="630" name="WaterBlurMultiplierHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult"
-			     decimal_digits="3" follows="left" height="10" increment=".001"
-			     initial_val="0" label="" left="494" max_val=".16" min_val="0"
-			     mouse_opaque="true" name="WaterBlurMult" show_text="true" value="0"
-			     width="200" />
-		</panel>
-		<panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-		     label="Image" left="1" mouse_opaque="false" name="Waves"
-		     width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-				Big Wave Direction
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="155" name="WaterWave1Help" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"
-			     width="10">
-				X
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"
-			     width="10">
-				Y
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WaterWave1DirX"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-			     mouse_opaque="true" name="WaterWave1DirX" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave1DirY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-			     mouse_opaque="true" name="WaterWave1DirY" show_text="true" value="0.7"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-70" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">
-				Little Wave Direction
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="155" name="WaterWave2Help" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"
-			     width="10">
-				X
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"
-			     width="10">
-				Y
-			</text>
-			<slider bottom="-100" can_edit_text="false" control_name="WaterWave2DirX"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-			     mouse_opaque="true" name="WaterWave2DirX" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave2DirY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-			     mouse_opaque="true" name="WaterWave2DirY" show_text="true" value="0.7"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">
-				Normal Map
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="365" name="WaterNormalMapHelp" width="18" />
-			<texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap"
-			     width="128" />
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
deleted file mode 100644
index d801251..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
+++ /dev/null
@@ -1,599 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="220" left="50" min_height="180"
-     min_width="400" mouse_opaque="true" name="WindLight floater"
-     rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
-     width="700">
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
-	     width="110">
-    Sky Presets:
-  </text>
-  <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
-	     left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
-	     width="150" />
-  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
-	     mouse_opaque="true" name="prev" scale_image="true" width="20" />
-  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
-	     mouse_opaque="true" name="next" scale_image="true" width="20" />
-	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="New" label_selected="New" left_delta="40"
-	     mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Save" label_selected="Save" left_delta="70"
-	     mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Delete" label_selected="Delete" left_delta="70"
-	     mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Day Cycle Editor" label_selected="Day Cycle Editor"
-	     left_delta="100" mouse_opaque="true" name="WLDayCycleMenuButton"
-	     scale_image="true" width="125" />
-	<tab_container bottom="-220" follows="left|top" height="160" left="0"
-	     mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
-		<panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
-		     label="Atmosphere" left="1" mouse_opaque="false"
-		     name="Atmosphere" width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-				Blue Horizon
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="160" name="WLBlueHorizonHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-				R
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-				G
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-				B
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-				I
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLBlueHorizonR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonR" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonG" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonB" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
-				Haze Horizon
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="160" name="WLHazeHorizonHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeHorizon"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.25" label="" left="24" max_val="1.0" min_val="0"
-			     mouse_opaque="true" name="WLHazeHorizon" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="BDensText2" v_pad="0" width="355">
-				Blue Density
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="395" name="WLBlueDensityHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-				R
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-				G
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-				B
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
-				I
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLBlueDensityR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityR" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityG" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityB" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
-				Haze Density
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="395" name="WLHazeDensityHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeDensity"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="4" min_val="0"
-			     mouse_opaque="true" name="WLHazeDensity" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
-				Density Multiplier
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="630" name="WLDensityMultHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLDensityMult"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.1" label="" left="494" max_val="0.9" min_val="0"
-			     mouse_opaque="true" name="WLDensityMult" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLDistanceMultText" v_pad="0"
-			     width="355">
-				Distance Multiplier
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="630" name="WLDistanceMultHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLDistancMult"
-			     decimal_digits="1" follows="left" height="10" increment="0.1"
-			     initial_val="1.0" label="" left="494" max_val="100" min_val="0"
-			     mouse_opaque="true" name="WLDistanceMult" show_text="true" value="0.0"
-			     width="207" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
-				Max Altitude
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="630" name="WLMaxAltitudeHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLMaxAltitude"
-			     decimal_digits="0" follows="left" height="10" increment="1"
-			     initial_val="500" label="" left="494" max_val="4000" min_val="0"
-			     mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000"
-			     width="205" />
-		</panel>
-		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-		     label="Lighting" left="1" mouse_opaque="true"
-		     name="Lighting" width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="SLCText" v_pad="0" width="355">
-				Sun/Moon Color
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="160" name="WLSunlightColorHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
-				R
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-				G
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-				B
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-				I
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLSunlightR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightR" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightG" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightB" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="TODText" v_pad="0" width="355">
-				Sun/Moon Position
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="160" name="WLTimeOfDayHelp" width="18" />
-			<icon bottom_delta="-30" follows="left|top" height="20" image_name="icon_diurnal.tga"
-			     left="30" name="SkyDayCycle" width="148" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLSunAngle"
-			     decimal_digits="3" follows="left" height="10" increment="0.001"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunAngle" show_text="true" value="1.0"
-			     width="204" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLAmbientText" v_pad="0" width="355">
-				Ambient
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="395" name="WLAmbientHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-				R
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-				G
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-				B
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-				I
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLAmbientR" decimal_digits="2"
-			     follows="left" height="10" increment="0.01" initial_val="0.7" label=""
-			     left="259" max_val="1" min_val="0" mouse_opaque="true" name="WLAmbientR"
-			     show_text="true" value="1.0" width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLAmbientG" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLAmbientB" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLAmbientI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLEastAngleText" v_pad="0" width="355">
-				East Angle
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="395" name="WLEastAngleHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLEastAngle"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.0" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLEastAngle" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="SunGlowText" v_pad="0" width="355">
-				Sun Glow
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="630" name="WLSunGlowHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLGlowB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.1" label="Focus " left="494" max_val="0.5" min_val="0"
-			     mouse_opaque="true" name="WLGlowB" show_text="true" value="1.0" width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLGlowR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.25" label="Size    " left="494" max_val="1.99" min_val="1"
-			     mouse_opaque="true" name="WLGlowR" show_text="true" value="1.0" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-67" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="SceneGammaText" v_pad="0" width="200">
-				Scene Gamma
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="630" name="WLSceneGammaHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLGamma"
-			     decimal_digits="2" follows="bottom" height="10" increment="0.01"
-			     initial_val="2.0" label="" left="494" max_val="10.0" min_val="0"
-			     mouse_opaque="true" name="WLGamma" show_text="true" value="2.0" width="207" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLStarText" v_pad="0" width="355">
-				Star Brightness
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="630" name="WLStarBrightnessHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLStarAlpha"
-			     decimal_digits="2" follows="bottom" height="10" increment="0.01"
-			     initial_val="0" label="" left="494" max_val="2" min_val="0"
-			     mouse_opaque="true" name="WLStarAlpha" show_text="true" value="0"
-			     width="200" />
-		</panel>
-		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-		     label="Clouds" left="1" mouse_opaque="false" name="Clouds"
-		     width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="WLCloudColorText" v_pad="0" width="355">
-				Cloud Color
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="160" name="WLCloudColorHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
-				R
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-				G
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-				B
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-				I
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLCloudColorR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorR" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorG" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorB" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="WLCloudColorText2" v_pad="0"
-			     width="355">
-				Cloud XY/Density
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="160" name="WLCloudDensityHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-				X
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-				Y
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-				D
-			</text>
-			<slider bottom="-117" can_edit_text="false" control_name="WLCloudX" decimal_digits="2"
-			     follows="left" height="10" increment="0.01" initial_val="0.5" label=""
-			     left="24" max_val="1" min_val="0" mouse_opaque="true" name="WLCloudX"
-			     show_text="true" value="0.5" width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudY" show_text="true" value="0.5"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDensity"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDensity" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLCloudCoverageText" v_pad="0"
-			     width="355">
-				Cloud Coverage
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="395" name="WLCloudCoverageHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudCoverage"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudCoverage" show_text="true" value="0.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
-			     width="355">
-				Cloud Scale
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="395" name="WLCloudScaleHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudScale"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="259" max_val="1.0" min_val="0.01"
-			     mouse_opaque="true" name="WLCloudScale" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLCloudDetailText" v_pad="0"
-			     width="355">
-				Cloud Detail (XY/Density)
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="395" name="WLCloudDetailHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-				X
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
-				Y
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText10" v_pad="0" width="10">
-				D
-			</text>
-			<slider bottom="-117" can_edit_text="false" control_name="WLCloudDetailX"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDetailX" show_text="true" value="0.5"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDetailY" show_text="true" value="0.5"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailDensity"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDetailDensity" show_text="true"
-			     value="1.0" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLCloudScrollXText" v_pad="0"
-			     width="355">
-				Cloud Scroll X
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="605" name="WLCloudScrollXHelp" width="18" />
-			<check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Lock" left="625" mouse_opaque="true"
-			     name="WLCloudLockX" width="200" />
-			<slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollX"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
-			     mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-60" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
-			     width="355">
-				Cloud Scroll Y
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="605" name="WLCloudScrollYHelp" width="18" />
-			<check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Lock" left="625" mouse_opaque="true"
-			     name="WLCloudLockY" width="200" />
-			<slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
-			     mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0"
-			     width="200" />
-			<check_box bottom="-120" control_name="DrawClassicClouds" follows="left"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Draw Classic Clouds" left="480" mouse_opaque="true"
-			     name="DrawClassicClouds" width="200" />
-			<button bottom="-102" follows="left|top" font="SansSerifSmall" height="15" label="?"
-			     left="608" name="WLClassicCloudsHelp" width="18" />
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
deleted file mode 100644
index cef04fd..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel background_opaque="true" background_visible="true"
-     bg_opaque_color="0.25 0.25 0.25 1.0" bottom="0" enabled="true"
-     follows="top|left|right" height="18" left="0" mouse_opaque="false"
-     name="status" width="1000">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-22" drop_shadow_visible="true" enabled="true"
-	     follows="left|right|bottom" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="18" hover="true" left="561" mouse_opaque="true"
-	     name="ParcelNameText" text_color="ParcelTextColor" hover_color="ParcelHoverColor"
-	     tool_tip="Name of land parcel on which you are standing. Click for About Land."
-	     v_pad="2" width="1039">
-		parcel name goes here
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-20" disabled_color="BalanceTextColor" drop_shadow_visible="true"
-	     enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-	     halign="right" height="18" left="-210" mouse_opaque="true"
-	     name="BalanceText" text_color="BalanceTextColor" tool_tip="Account Balance"
-	     v_pad="2" width="76">
-		Loading...
-	</text>
-	<button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="16"
-	     image_selected="status_buy_currency_pressed.tga"
-	     image_unselected="status_buy_currency.tga" label="" label_selected=""
-	     left="-210" mouse_opaque="true" name="buycurrency" scale_image="true"
-	     tool_tip="Buy currency" width="16" />
-	<text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true"
-	     enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-	     halign="right" height="18" left="-300" mouse_opaque="true" name="TimeText"
-	     text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
-		12:00 AM
-	</text>
-	<string name="StatBarDaysOfWeek">
-		Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
-	</string>
-	<string name="StatBarMonthsOfYear">
-		January:February:March:April:May:June:July:August:September:October:November:December
-	</string>
-	<button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="16" image_selected="status_script_debug.tga"
-	     image_unselected="status_script_debug.tga" label="" label_selected=""
-	     left="378" mouse_opaque="true" name="scriptout" scale_image="false"
-	     tool_tip="Script Warnings and Errors" visible="false" width="16" />
-	<button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="18" image_selected="status_health.tga"
-	     image_unselected="status_health.tga" label="" label_selected="" left="394"
-	     mouse_opaque="true" name="health" scale_image="false" tool_tip="Health"
-	     visible="false" width="24" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-18" disabled_color="HealthTextColor" drop_shadow_visible="true"
-	     enabled="true" follows="rsight|bottom" font="SansSerifSmall" h_pad="0"
-	     halign="left" height="18" left="418" mouse_opaque="true" name="HealthText"
-	     text_color="HealthTextColor" tool_tip="Health" v_pad="2" visible="false" width="31">
-		100%
-	</text>
-	<button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="18" image_selected="status_no_fly.tga"
-	     image_unselected="status_no_fly.tga" label="" label_selected="" left="449"
-	     mouse_opaque="true" name="no_fly" scale_image="false"
-	     tool_tip="Flying not allowed" visible="false" width="24" />
-	<button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="18" image_selected="status_no_build.tga"
-	     image_unselected="status_no_build.tga" label="" label_selected=""
-	     left="473" name="no_build" scale_image="false"
-	     tool_tip="Building/Rezzing not allowed" visible="false" width="24" />
-	<button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="18" image_selected="status_no_scripts.tga"
-	     image_unselected="status_no_scripts.tga" label="" label_selected=""
-	     left="497" mouse_opaque="true" name="no_scripts" scale_image="false"
-	     tool_tip="Scripts not allowed" visible="false" width="24" />
-	<button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="18" image_selected="status_no_push.tga"
-	     image_unselected="status_no_push.tga" label="" label_selected="" left="521"
-	     mouse_opaque="true" name="restrictpush" scale_image="false"
-	     tool_tip="No Pushing" visible="false" width="24" />
-	<button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="18" image_selected="status_no_voice.tga"
-	     image_unselected="status_no_voice.tga" label="" label_selected=""
-	     left="545" mouse_opaque="true" name="status_no_voice" scale_image="false"
-	     tool_tip="Voice not available here" visible="false" width="24" />
-	<button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="16" image_selected="status_buy_land_pressed.tga"
-	     image_unselected="status_buy_land.tga" label="" label_selected=""
-	     left="576" mouse_opaque="true" name="buyland" scale_image="true"
-	     tool_tip="Buy this parcel" visible="false" width="16" />
-
-  <!-- Totally unsexy button hack to get a sexy bevel for sexy search bevel -brent -->
-  <button bottom="-17" height="16" left="-97" width="96" 
-          image_unselected="sm_rounded_corners_simple.tga"
-          image_selected="sm_rounded_corners_simple.tga"
-          image_hover_selected="sm_rounded_corners_simple.tga"
-          image_hover_unselected="sm_rounded_corners_simple.tga"
-          image_disabled_selected="sm_rounded_corners_simple.tga"
-          image_disabled="sm_rounded_corners_simple.tga"
-          label="" scale_image="true" enabled="true" mouse_opaque="false" name="menubar_search_bevel_bg" />
-
-  <line_editor bevel_style="none" border_style="line" border_thickness="0" bottom="-16"
-	     commit_on_focus_lost="false" enabled="true" follows="right|bottom"
-	     font="SansSerifSmall" handle_edit_keys_directly="false" height="13"
-	     label="Search" left="-95" max_length="254" mouse_opaque="true"
-	     name="search_editor" select_all_on_focus_received="false"
-	     select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
-	     width="80" />
-	<button bottom="-16" enabled="true" follows="right|bottom" font="SansSerifSmall"
-	     halign="center" height="12" image_disabled="status_search.tga"
-	     image_disabled_selected="status_search.tga"
-	     image_selected="status_search.tga" image_unselected="status_search.tga"
-	     label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
-	     tool_tip="Search Second Life" width="12" scale_image="true"/>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall"
-	     halign="center" height="12" left="-20" mouse_opaque="true"
-	     name="stat_btn" width="20" />
-	<string name="packet_loss_tooltip">
-		Packet Loss
-	</string>
-	<string name="bandwidth_tooltip">
-		Bandwidth
-	</string>
-</panel>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_voice_controls.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_voice_controls.xml
deleted file mode 100644
index 423564f..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_voice_controls.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="2"
-     enabled="true" follows="right|bottom" height="20" left="0"
-     mouse_opaque="true" name="voice_controls" width="130">
-	<button bottom="-21" height="20" image_overlay="active_speakers.tga" label="" left="3"
-	     name="speakers_btn"
-	     tool_tip="Show list of residents using voice chat around you" width="36" />
-	<button bottom="-21" height="20" label="Talk" left_delta="38" name="push_to_talk"
-	     tab_stop="false" tool_tip="Hold the button to talk" width="63" />
-	<button bottom="-19" height="16" image_selected="ptt_lock_on.tga"
-	     image_unselected="ptt_lock_off.tga" label="" left_delta="2" name="ptt_lock"
-	     scale_image="false" toggle="true"
-	     tool_tip="Click lock to switch to talk mode" width="16" />
-	<icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="42"
-	     name="voice_volume" width="16" />
-	<button bottom="-21" control_name="ShowVoiceChannelPopup" height="20" label=""
-	     left_delta="21" name="show_channel" scale_image="true" toggle="true"
-	     tool_tip="Click to show current voice channel" width="20" />
-</panel>
-- 
cgit v1.1