From cd17687f01420952712a500107e0f93e7ab8d5f8 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:34 -0500
Subject: Second Life viewer sources 1.19.1.0

---
 linden/indra/newview/skins/xui/de/floater_html.xml |   14 +-
 linden/indra/newview/skins/xui/en-us/LCD_text.xml  |  102 +-
 linden/indra/newview/skins/xui/en-us/alerts.xml    |  677 +++++++++---
 .../newview/skins/xui/en-us/floater_about.xml      |   11 +-
 .../newview/skins/xui/en-us/floater_about_land.xml |  916 +++++++++--------
 .../skins/xui/en-us/floater_active_speakers.xml    |   93 +-
 .../skins/xui/en-us/floater_animation_preview.xml  |   53 +-
 .../newview/skins/xui/en-us/floater_auction.xml    |    4 +-
 .../skins/xui/en-us/floater_audio_volume.xml       |   15 +-
 .../skins/xui/en-us/floater_avatar_picker.xml      |   49 +-
 .../skins/xui/en-us/floater_avatar_textures.xml    |    6 +-
 .../newview/skins/xui/en-us/floater_bumps.xml      |   32 +-
 .../skins/xui/en-us/floater_buy_contents.xml       |   12 +-
 .../skins/xui/en-us/floater_buy_currency.xml       |   14 +-
 .../newview/skins/xui/en-us/floater_buy_land.xml   |  177 ++--
 .../newview/skins/xui/en-us/floater_buy_object.xml |   19 +-
 .../skins/xui/en-us/floater_chat_history.xml       |  114 ++-
 .../newview/skins/xui/en-us/floater_chatterbox.xml |    3 +-
 .../skins/xui/en-us/floater_color_picker.xml       |    2 +-
 .../newview/skins/xui/en-us/floater_critical.xml   |    2 +-
 .../newview/skins/xui/en-us/floater_customize.xml  |  921 ++++++++---------
 .../skins/xui/en-us/floater_day_cycle_options.xml  |  250 +++++
 .../skins/xui/en-us/floater_device_settings.xml    |    7 +-
 .../newview/skins/xui/en-us/floater_directory.xml  |  339 +++---
 .../skins/xui/en-us/floater_env_settings.xml       |   66 ++
 .../newview/skins/xui/en-us/floater_friends.xml    |   20 +-
 .../newview/skins/xui/en-us/floater_god_tools.xml  |  261 +++--
 .../newview/skins/xui/en-us/floater_groups.xml     |   44 +-
 .../skins/xui/en-us/floater_hardware_settings.xml  |   53 +
 .../indra/newview/skins/xui/en-us/floater_html.xml |   40 +-
 .../indra/newview/skins/xui/en-us/floater_im.xml   |   33 +-
 .../skins/xui/en-us/floater_image_preview.xml      |   10 +-
 .../newview/skins/xui/en-us/floater_inspect.xml    |   57 +-
 .../skins/xui/en-us/floater_instant_message.xml    |   24 +-
 .../xui/en-us/floater_instant_message_ad_hoc.xml   |  109 +-
 .../xui/en-us/floater_instant_message_group.xml    |   38 +-
 .../newview/skins/xui/en-us/floater_inventory.xml  |  165 ++-
 .../en-us/floater_inventory_item_properties.xml    |   20 +-
 .../xui/en-us/floater_inventory_view_finder.xml    |  123 +--
 .../newview/skins/xui/en-us/floater_joystick.xml   |  145 ++-
 .../newview/skins/xui/en-us/floater_lagmeter.xml   |  621 ++++-------
 .../skins/xui/en-us/floater_land_holdings.xml      |    4 +-
 .../skins/xui/en-us/floater_landmark_ctrl.xml      |   62 +-
 .../skins/xui/en-us/floater_live_lsleditor.xml     |   22 +-
 .../newview/skins/xui/en-us/floater_lsl_guide.xml  |   20 +-
 .../skins/xui/en-us/floater_media_browser.xml      |   37 +
 .../newview/skins/xui/en-us/floater_moveview.xml   |   27 +-
 .../indra/newview/skins/xui/en-us/floater_mute.xml |   20 +-
 .../skins/xui/en-us/floater_mute_object.xml        |   10 +-
 .../newview/skins/xui/en-us/floater_my_friends.xml |    4 +-
 .../newview/skins/xui/en-us/floater_new_im.xml     |   30 +-
 .../skins/xui/en-us/floater_new_outfit_dialog.xml  |  263 +++--
 .../newview/skins/xui/en-us/floater_openobject.xml |   22 +-
 .../indra/newview/skins/xui/en-us/floater_pay.xml  |   58 +-
 .../newview/skins/xui/en-us/floater_pay_object.xml |   63 +-
 .../skins/xui/en-us/floater_post_process.xml       |  184 ++++
 .../newview/skins/xui/en-us/floater_postcard.xml   |   45 +-
 .../skins/xui/en-us/floater_preferences.xml        |   40 +-
 .../skins/xui/en-us/floater_preview_animation.xml  |   23 +-
 .../skins/xui/en-us/floater_preview_classified.xml |   11 +-
 .../xui/en-us/floater_preview_embedded_texture.xml |   14 +-
 .../skins/xui/en-us/floater_preview_event.xml      |   10 +-
 .../en-us/floater_preview_existing_landmark.xml    |   10 +-
 .../skins/xui/en-us/floater_preview_gesture.xml    |   18 +-
 .../xui/en-us/floater_preview_new_landmark.xml     |   33 +-
 .../skins/xui/en-us/floater_preview_notecard.xml   |   39 +-
 .../floater_preview_notecard_keep_discard.xml      |   36 +-
 .../skins/xui/en-us/floater_preview_sound.xml      |   38 +-
 .../skins/xui/en-us/floater_preview_texture.xml    |   18 +-
 .../en-us/floater_preview_texture_keep_discard.xml |   30 +-
 .../skins/xui/en-us/floater_preview_url.xml        |   10 +-
 .../skins/xui/en-us/floater_price_for_listing.xml  |   10 +-
 .../indra/newview/skins/xui/en-us/floater_rate.xml |   73 +-
 .../skins/xui/en-us/floater_region_info.xml        |    6 +-
 .../skins/xui/en-us/floater_report_abuse.xml       |   48 +-
 .../newview/skins/xui/en-us/floater_report_bug.xml |   43 +-
 .../skins/xui/en-us/floater_script_debug.xml       |   10 +-
 .../skins/xui/en-us/floater_script_ed_panel.xml    |  119 +--
 .../skins/xui/en-us/floater_script_preview.xml     |   24 +-
 .../skins/xui/en-us/floater_script_queue.xml       |   15 +-
 .../skins/xui/en-us/floater_script_search.xml      |   37 +-
 .../newview/skins/xui/en-us/floater_select_key.xml |   30 +-
 .../newview/skins/xui/en-us/floater_sell_land.xml  |   28 +-
 .../skins/xui/en-us/floater_settings_debug.xml     |    1 +
 .../xui/en-us/floater_sim_release_message.xml      |   20 +-
 .../newview/skins/xui/en-us/floater_snapshot.xml   |   56 +-
 .../skins/xui/en-us/floater_sound_preview.xml      |    8 +-
 .../indra/newview/skins/xui/en-us/floater_test.xml |    8 +-
 .../skins/xui/en-us/floater_texture_ctrl.xml       |   71 +-
 .../newview/skins/xui/en-us/floater_tools.xml      | 1078 ++++++++++----------
 .../skins/xui/en-us/floater_top_objects.xml        |   63 +-
 .../indra/newview/skins/xui/en-us/floater_tos.xml  |    6 +-
 .../newview/skins/xui/en-us/floater_url_entry.xml  |   23 +
 .../skins/xui/en-us/floater_voice_wizard.xml       |   34 +-
 .../newview/skins/xui/en-us/floater_water.xml      |  260 +++++
 .../skins/xui/en-us/floater_wearable_save_as.xml   |   22 +-
 .../skins/xui/en-us/floater_windlight_options.xml  |  593 +++++++++++
 .../newview/skins/xui/en-us/floater_world_map.xml  |   24 +-
 .../newview/skins/xui/en-us/menu_inventory.xml     |  237 +++--
 .../indra/newview/skins/xui/en-us/menu_login.xml   |   42 +-
 .../skins/xui/en-us/menu_pie_attachment.xml        |    6 +-
 .../newview/skins/xui/en-us/menu_pie_avatar.xml    |   36 +-
 .../newview/skins/xui/en-us/menu_pie_land.xml      |   20 +-
 .../newview/skins/xui/en-us/menu_pie_object.xml    |   38 +-
 .../newview/skins/xui/en-us/menu_pie_self.xml      |   30 +-
 .../indra/newview/skins/xui/en-us/menu_slurl.xml   |   16 +-
 .../indra/newview/skins/xui/en-us/menu_viewer.xml  |  953 +++++++++--------
 .../indra/newview/skins/xui/en-us/mime_types.xml   |  448 ++++++++
 linden/indra/newview/skins/xui/en-us/notify.xml    |  102 +-
 .../indra/newview/skins/xui/en-us/panel_audio.xml  |   18 +-
 .../newview/skins/xui/en-us/panel_audio_device.xml |  137 ++-
 .../indra/newview/skins/xui/en-us/panel_avatar.xml |  124 +--
 .../skins/xui/en-us/panel_avatar_classified.xml    |   12 +-
 .../indra/newview/skins/xui/en-us/panel_bars.xml   |   30 +-
 .../indra/newview/skins/xui/en-us/panel_bg_tab.xml |   20 +-
 .../newview/skins/xui/en-us/panel_chat_bar.xml     |   22 +-
 .../newview/skins/xui/en-us/panel_classified.xml   |   11 +-
 .../indra/newview/skins/xui/en-us/panel_event.xml  |   12 +-
 .../newview/skins/xui/en-us/panel_friends.xml      |   53 +-
 .../indra/newview/skins/xui/en-us/panel_group.xml  |   14 +-
 .../skins/xui/en-us/panel_group_general.xml        |   79 +-
 .../newview/skins/xui/en-us/panel_group_invite.xml |   10 +-
 .../skins/xui/en-us/panel_group_land_money.xml     |   19 +-
 .../skins/xui/en-us/panel_group_notices.xml        |   14 +-
 .../newview/skins/xui/en-us/panel_group_roles.xml  |   63 +-
 .../newview/skins/xui/en-us/panel_group_voting.xml |   82 +-
 .../indra/newview/skins/xui/en-us/panel_groups.xml |   46 +-
 .../skins/xui/en-us/panel_land_covenant.xml        |   18 +-
 .../indra/newview/skins/xui/en-us/panel_login.xml  |   35 +-
 .../skins/xui/en-us/panel_master_volume.xml        |    4 +-
 .../skins/xui/en-us/panel_media_controls.xml       |   67 +-
 .../newview/skins/xui/en-us/panel_media_remote.xml |   33 +-
 .../xui/en-us/panel_media_remote_expanded.xml      |   11 +-
 .../newview/skins/xui/en-us/panel_music_remote.xml |   21 +-
 .../newview/skins/xui/en-us/panel_overlaybar.xml   |   86 +-
 .../indra/newview/skins/xui/en-us/panel_place.xml  |   74 +-
 .../newview/skins/xui/en-us/panel_place_small.xml  |   74 +-
 .../skins/xui/en-us/panel_preferences_LCD.xml      |   91 +-
 .../skins/xui/en-us/panel_preferences_audio.xml    |   93 +-
 .../skins/xui/en-us/panel_preferences_chat.xml     |  135 ++-
 .../skins/xui/en-us/panel_preferences_general.xml  |  157 +--
 .../xui/en-us/panel_preferences_graphics1.xml      |  413 ++++++--
 .../xui/en-us/panel_preferences_graphics2.xml      |  132 ---
 .../xui/en-us/panel_preferences_graphics3.xml      |  119 ---
 .../skins/xui/en-us/panel_preferences_im.xml       |   94 +-
 .../skins/xui/en-us/panel_preferences_input.xml    |   73 +-
 .../skins/xui/en-us/panel_preferences_network.xml  |  100 +-
 .../skins/xui/en-us/panel_preferences_popups.xml   |   36 +-
 .../skins/xui/en-us/panel_preferences_voice.xml    |  182 ++--
 .../skins/xui/en-us/panel_preferences_web.xml      |   89 +-
 .../skins/xui/en-us/panel_region_covenant.xml      |   32 +-
 .../newview/skins/xui/en-us/panel_region_debug.xml |    8 +-
 .../skins/xui/en-us/panel_region_estate.xml        |  212 ++--
 .../skins/xui/en-us/panel_region_general.xml       |   13 +-
 .../skins/xui/en-us/panel_region_terrain.xml       |    1 +
 .../skins/xui/en-us/panel_region_texture.xml       |    1 +
 .../skins/xui/en-us/panel_scrolling_param.xml      |   38 +-
 .../skins/xui/en-us/panel_speaker_controls.xml     |  105 +-
 .../newview/skins/xui/en-us/panel_status_bar.xml   |  147 +--
 .../newview/skins/xui/en-us/panel_toolbar.xml      |   21 +-
 .../skins/xui/en-us/panel_voice_controls.xml       |    3 +-
 .../newview/skins/xui/en-us/panel_voice_enable.xml |  135 +--
 .../skins/xui/en-us/panel_voice_options.xml        |    7 +-
 .../newview/skins/xui/en-us/panel_voice_remote.xml |   10 +-
 .../xui/en-us/panel_voice_remote_expanded.xml      |   22 +-
 .../newview/skins/xui/en-us/teleport_strings.xml   |   48 +-
 linden/indra/newview/skins/xui/es/floater_html.xml |    6 +-
 linden/indra/newview/skins/xui/fr/floater_html.xml |    6 +-
 linden/indra/newview/skins/xui/ja/floater_html.xml |   14 +-
 linden/indra/newview/skins/xui/ko/floater_html.xml |   14 +-
 linden/indra/newview/skins/xui/pt/floater_html.xml |   22 +-
 linden/indra/newview/skins/xui/zh/floater_html.xml |    6 +-
 172 files changed, 8549 insertions(+), 6725 deletions(-)
 create mode 100644 linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
 create mode 100644 linden/indra/newview/skins/xui/en-us/floater_env_settings.xml
 create mode 100644 linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml
 create mode 100644 linden/indra/newview/skins/xui/en-us/floater_media_browser.xml
 create mode 100644 linden/indra/newview/skins/xui/en-us/floater_post_process.xml
 create mode 100644 linden/indra/newview/skins/xui/en-us/floater_url_entry.xml
 create mode 100644 linden/indra/newview/skins/xui/en-us/floater_water.xml
 create mode 100644 linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
 create mode 100644 linden/indra/newview/skins/xui/en-us/mime_types.xml
 delete mode 100644 linden/indra/newview/skins/xui/en-us/panel_preferences_graphics2.xml
 delete mode 100644 linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml

(limited to 'linden/indra/newview/skins/xui')

diff --git a/linden/indra/newview/skins/xui/de/floater_html.xml b/linden/indra/newview/skins/xui/de/floater_html.xml
index 22b8e60..1b37b52 100644
--- a/linden/indra/newview/skins/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/xui/de/floater_html.xml
@@ -8,16 +8,8 @@
 	<text name="home_page_url">
 		http://www.secondlife.com
 	</text>
-	<text name="in-world_help_title">
-		In-Welt-Hilfe
-	</text>
-	<text name="in-world_help_url">
-		http://www.secondlife.com/app/support/inworld.html
-	</text>
-	<text name="additional_help_title">
-		Weitere Hilfe
-	</text>
-	<text name="additional_help_url">
-		http://www.secondlife.com/app/support/support.html
+	<text hidden="true" name="f1_help_title">Second Life Help</text>
+	<text hidden="true" name="f1_help_url">
+		http://secondlife.com/app/support/index_de.html
 	</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/LCD_text.xml b/linden/indra/newview/skins/xui/en-us/LCD_text.xml
index d679d64..b9c1200 100644
--- a/linden/indra/newview/skins/xui/en-us/LCD_text.xml
+++ b/linden/indra/newview/skins/xui/en-us/LCD_text.xml
@@ -1,28 +1,76 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" follows="left|top|right|bottom" height="600" hidden="true" left="0"
-     mouse_opaque="true" name="panel_login" width="800">
-	<text hidden="true" name="DebugInfo">Debug Info</text>
-	<text hidden="true" name="FPS">FPS</text>
-	<text hidden="true" name="SimFPS">SimFPS</text>
-	<text hidden="true" name="Pin">P-In</text>
-	<text hidden="true" name="Pout">P-Out</text>
-	<text hidden="true" name="PLoss">P-Loss</text>
-	<text hidden="true" name="Ping">Ping</text>
-	<text hidden="true" name="AccountDetails">Account Details</text>
-	<text hidden="true" name="LBal">L$ bal</text>
-	<text hidden="true" name="Time">Time</text>
-	<text hidden="true" name="LocationDetails1">Location Details 1</text>
-	<text hidden="true" name="LocationDetails2">Location Details 2</text>
-	<text hidden="true" name="Region">Region</text>
-	<text hidden="true" name="Parcel">Parcel</text>
-	<text hidden="true" name="Pos">Pos</text>
-	<text hidden="true" name="Sqm">Sqm</text>
-	<text hidden="true" name="Owner">Owner</text>
-	<text hidden="true" name="Type">Type</text>
-	<text hidden="true" name="Yes">Yes</text>
-	<text hidden="true" name="No">No</text>
-	<text hidden="true" name="Forsale">ForSale</text>
-	<text hidden="true" name="Traffic">Traffic</text>
-	<text hidden="true" name="Last3ChatLines">Last 3 Chat Lines</text>
-	<text hidden="true" name="Last3IMLines">Last 3 IM Lines</text>
-</panel>			
\ No newline at end of file
+<panel bottom="0" follows="left|top|right|bottom" height="600" left="0"
+     mouse_opaque="true" name="panel_login" visible="false" width="800">
+	<string name="DebugInfo">
+		Debug Info
+	</string>
+	<string name="FPS">
+		FPS
+	</string>
+	<string name="SimFPS">
+		SimFPS
+	</string>
+	<string name="Pin">
+		P-In
+	</string>
+	<string name="Pout">
+		P-Out
+	</string>
+	<string name="PLoss">
+		P-Loss
+	</string>
+	<string name="Ping">
+		Ping
+	</string>
+	<string name="AccountDetails">
+		Account Details
+	</string>
+	<string name="LBal">
+		L$ bal
+	</string>
+	<string name="Time">
+		Time
+	</string>
+	<string name="LocationDetails1">
+		Location Details 1
+	</string>
+	<string name="LocationDetails2">
+		Location Details 2
+	</string>
+	<string name="Region">
+		Region
+	</string>
+	<string name="Parcel">
+		Parcel
+	</string>
+	<string name="Pos">
+		Pos
+	</string>
+	<string name="Sqm">
+		Sqm
+	</string>
+	<string name="Owner">
+		Owner
+	</string>
+	<string name="Type">
+		Type
+	</string>
+	<string name="Yes">
+		Yes
+	</string>
+	<string name="No">
+		No
+	</string>
+	<string name="Forsale">
+		ForSale
+	</string>
+	<string name="Traffic">
+		Traffic
+	</string>
+	<string name="Last3ChatLines">
+		Last 3 Chat Lines
+	</string>
+	<string name="Last3IMLines">
+		Last 3 IM Lines
+	</string>
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 67f7df5..69491ef 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
-	<global name="skipnexttime">Don't show me this again</global>
-	<global name="alwayschoose">Always choose this option</global>
-	
+	<global name="skipnexttime">
+		Don&apos;t show me this again
+	</global>
+	<global name="alwayschoose">
+		Always choose this option
+	</global>
 	<alert modal="true" name="MissingAlert">
 		<message name="message">
 			[ALERT_NAME] is missing from alerts.xml!
@@ -340,13 +343,13 @@ according to the Community Standards.
 			Selecting the &quot;Publish in Search&quot; 
 Checking this box will show:
 - this parcel in search results
-- this parcel's public objects
+- this parcel&apos;s public objects
 - this parcel in web search
 		</message>
 	</alert>
 	<alert modal="true" name="ClickPublishHelpLandDisabled">
 		<message name="message">
-You can't make this parcel show in search because it is located in a
+			You can&apos;t make this parcel show in search because it is located in a
 region that forbids this.
 		</message>
 	</alert>
@@ -368,16 +371,16 @@ according to the Community Standards.
 	</alert>
 	<alert modal="true" name="ClickPartnerHelpAvatar">
 		<message name="message">
-You can propose to another Resident or dissolve an existing partnership through the [SECOND_LIFE] website.
+			You can propose to another Resident or dissolve an existing partnership through the [SECOND_LIFE] website.
 
 Go to the Second Life web site for more information on partnering?
 		</message>
-                <option name="GotoPage">
-                        Go to Page
-                </option>
-                <option name="Cancel">
-                        Cancel
-                </option>
+		<option name="GotoPage">
+			Go to Page
+		</option>
+		<option name="Cancel">
+			Cancel
+		</option>
 	</alert>
 	<alert modal="true" name="ClickWebProfileHelpAvatar">
 		<message name="message">
@@ -505,14 +508,13 @@ Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NA
 		<option default="true" name="Cancel">
 			Cancel
 		</option>
-	</alert>	
-	<alert modal="true" caution="true" name="ConfirmLandSaleToAnyoneChange">
+	</alert>
+	<alert caution="true" modal="true" name="ConfirmLandSaleToAnyoneChange">
 		<message name="message">
-ATTENTION: Clicking 'sell to anyone' makes your land available to the entire Second Life community, even those not in this region.
+			ATTENTION: Clicking &apos;sell to anyone&apos; makes your land available to the entire Second Life community, even those not in this region.
 
 The selected [LAND_SIZE] m2 land is being set for sale.
 Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
- 
 		</message>
 		<option name="Continue">
 			OK
@@ -614,7 +616,7 @@ Objects: [N]
 		<option name="Return">
 			OK
 		</option>
-		<option default = "true" name="Cancel">
+		<option default="true" name="Cancel">
 			Cancel
 		</option>
 	</alert>
@@ -1013,6 +1015,55 @@ Are you sure you want to delete these items?
 because you have specified the -safe option.
 		</message>
 	</alert>
+	<alert modal="true" name="UnsupportedGLRequirements">
+		<message name="message">
+			You do not appear to have the proper hardware requirements for Second Life. Second Life requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
+
+If you continue to have problems, please visit: http://www.secondlife.com/support
+		</message>
+	</alert>
+	<alert modal="true" name="UnsupportedHardware">
+		<message name="message">
+			Warning: Your system does not meet Second Life&apos;s minimum system requirements. If you continue using Second Life, you may experience poor performance. Unfortunately, we cannot provide technical support for unsupported system configurations. 
+
+MINSPECS
+Do you wish to visit [_URL] for more information?
+		</message>
+		<option name="Yes">
+			Yes
+		</option>
+		<option name="No">
+			No
+		</option>
+		<url option="0">
+			http://www.secondlife.com/corporate/sysreqs.php
+		</url>
+	</alert>
+	<alert modal="true" name="UnsupportedGPU">
+		<message name="message">
+			- Your graphics card does not meet the minimum requirements.
+		</message>
+	</alert>
+	<alert modal="true" name="UnsupportedCPU">
+		<message name="message">
+			- Your CPU speed does not meet the minimum requirements.
+		</message>
+	</alert>
+	<alert modal="true" name="UnsupportedCPUAmount">
+		<message name="message">
+			796
+		</message>
+	</alert>
+	<alert modal="true" name="UnsupportedRAM">
+		<message name="message">
+			- Your system memory does not meet the minimum requirements.
+		</message>
+	</alert>
+	<alert modal="true" name="UnsupportedRAMAmount">
+		<message name="message">
+			510
+		</message>
+	</alert>
 	<alert modal="true" name="DisplaySettingsRecommended">
 		<message name="message">
 			Display settings have been set to recommended levels
@@ -1025,10 +1076,10 @@ based on your system configuration.
 	<alert modal="true" name="DisplaySettingsNoShaders">
 		<message name="message">
 			[SECOND_LIFE] crashed while initializing graphics drivers.
-Shaders will be disabled in order to avoid some common driver errors.
+Graphics Quality will be set to low to avoid some common driver errors.
 This will disable some graphics features.
 We recommend updating your graphics card drivers.
-Shaders can be re-enabled in Preferences &gt; Graphics Detail.
+Graphics Quality can be raised in Preferences &gt; Graphics.
 		</message>
 	</alert>
 	<alert modal="true" name="CannotRequestDomain">
@@ -1568,6 +1619,20 @@ have permission to modify.
 			No frontmost floater to save.
 		</message>
 	</alert>
+	<alert modal="true" name="SeachFilteredOnShortWords">
+		<message name="message">
+Your search query was modified and the 
+words that were too short were removed.
+
+Searched for: [FINALQUERY]
+		</message>
+	</alert>
+	<alert modal="true" name="SeachFilteredOnShortWordsEmpty">
+		<message name="message">
+Your search terms were too short
+so no search was performed.
+		</message>
+	</alert>
 	<alert modal="true" name="ColladaExportFailedUnknownServerError">
 		<message name="message">
 			Collada export failed: Unknown server error.
@@ -1684,27 +1749,6 @@ Cannot find the region this land is in.
 Please use Tools -&gt; Report Bug to report this.
 		</message>
 	</alert>
-	<alert modal="true" name="CannotSetLandOwnerNothingSelected">
-		<message name="message">
-			Unable to set land owner:
-No parcel selected.
-		</message>
-	</alert>
-	<alert modal="true" name="CannotBuyLandMultipleRegions">
-		<message name="message">
-			Unable to buy land because selection spans multiple regions.
-
-Please select a smaller area and try again.
-		</message>
-	</alert>
-	<alert modal="true" name="CannotBuyLandMultipleSelected">
-		<message name="message">
-			Unable to buy land:
-Multiple parcels selected.
-
-Try selecting a single parcel.
-		</message>
-	</alert>
 	<alert modal="true" name="CannotDeedLandMultipleSelected">
 		<message name="message">
 			Unable to deed land:
@@ -1750,14 +1794,6 @@ Preferences &gt; Audio &amp; Video.)
 			Disable
 		</option>
 	</alert>
-	<alert modal="true" name="CannotBuyLandWaitingForServer">
-		<message name="message">
-			Unable to buy land:
-Waiting for server to report cost.
-
-Please try again.
-		</message>
-	</alert>
 	<alert modal="true" name="CannotDeedLandWaitingForServer">
 		<message name="message">
 			Unable to deed land:
@@ -1766,59 +1802,12 @@ Waiting for server to report ownership.
 Please try again.
 		</message>
 	</alert>
-	<alert modal="true" name="CannotBuyLandNoPublic">
-		<message name="message">
-			Unable to buy land:
-The selection doesn&apos;t contain any public land.
-		</message>
-	</alert>
-	<alert modal="true" name="CannotBuyLandLandOwned">
-		<message name="message">
-			Unable to buy land:
-You have selected a parcel owned
-by another Resident.
-		</message>
-	</alert>
-	<alert modal="true" name="CannotButLandRegionNotFound">
-		<message name="message">
-			Unable to buy land:
-Cannot find the region this land is in.
-
-Please use Tools -&gt; Report Bug to report this.
-		</message>
-	</alert>
-	<alert modal="true" name="CannotBuyLandNoTransfer">
-		<message name="message">
-			Unable to buy land:
-The region [REGION] does not allow transfer of land.
-		</message>
-	</alert>
 	<alert modal="true" name="CannotDeedLandNoTransfer">
 		<message name="message">
 			Unable to deed land:
 The region [REGION] does not allow transfer of land.
 		</message>
 	</alert>
-	<alert modal="true" name="CannotBuyLandForGroupNotOfficer">
-		<message name="message">
-			Unable to buy land for the group:
-You are not an officer in your current group.
-
-Please activate another group using Edit -&gt; Groups...
-		</message>
-	</alert>
-	<alert modal="true" name="CannotBuyLandInsufficientFunds">
-		<message name="message">
-			Buying this [AREA] m2 of land costs L$[PRICE].
-You only have L$[BALANCE].
-		</message>
-	</alert>
-	<alert modal="true" name="CannotReleaseLandNothingSelected">
-		<message name="message">
-			Unable to abandon land:
-No parcel selected.
-		</message>
-	</alert>
 	<alert modal="true" name="CannotReleaseLandWatingForServer">
 		<message name="message">
 			Unable to abandon land:
@@ -2066,7 +2055,7 @@ Click Quit to exit [SECOND_LIFE] immediately.
 You do not have permission to buy land for your active group.
 		</message>
 	</alert>
-	<alert model="true" name="AddFriend" title="Add Friend">
+	<alert modal="true" name="AddFriend" title="Add Friend">
 		<message name="message">
 			Friends can give permissions to 
 track each other on the map and 
@@ -2152,11 +2141,6 @@ of the above content is considered Mature according to the
 Community Standards.
 		</message>
 	</alert>
-	<alert modal="true" name="ErrorEncodingSnapshot">
-		<message name="message">
-			Error encoding snapshot!
-		</message>
-	</alert>
 	<alert modal="true" name="BlankClassifiedName">
 		<message name="message">
 			You must specify a name for your classified.
@@ -2471,7 +2455,7 @@ Please check your network connection.
 	</alert>
 	<alert modal="true" name="LoginPacketNeverReceived">
 		<message name="message">
-We're having trouble connecting. There may be a problem with your internet connection or the Second Life servers.
+			We&apos;re having trouble connecting. There may be a problem with your internet connection or the Second Life servers.
 
 You can either check your internet connection and try again in a few minutes, click Help to connect to our support site, or click Teleport to attempt to teleport home.
 		</message>
@@ -2779,26 +2763,6 @@ Download to your Applications folder?
 			Cancel
 		</option>
 	</alert>
-	<alert modal="true" name="AddClassified">
-		<message name="message">
-			Classified ads appear in the &apos;Classified&apos; section of the
-Find directory for one week.
-Fill out your ad, then click &apos;Publish...&apos; to add it to the
-directory.
-You&apos;ll be asked for a price to pay when clicking Publish.
-Paying more makes your ad appear higher in the list, and
-also appear higher when people search for keywords.
-		</message>
-		<ignore name="ignore">
-			When adding a new Classified
-		</ignore>
-		<option name="OK">
-			OK
-		</option>
-		<option name="Cancel">
-			Cancel
-		</option>
-	</alert>
 	<alert modal="true" name="WebLaunchJoinNow">
 		<message name="message">
 			Go to www.secondlife.com to manage your account?
@@ -3310,7 +3274,7 @@ This is DANGEROUS and should only be done to invoke the
 hack allowing objects/L$ to be transfered in/out of 
 a grid. 
 It will change thousands of regions and make the 
-spaceserver hiccup. 
+spaceserver hiccup.
 		</message>
 		<option name="ChangeEstate">
 			OK
@@ -3630,15 +3594,15 @@ Default: Checked
 	</alert>
 	<alert modal="true" name="HelpRegionSearch" title="Do Not Show In Search">
 		<message name="message">
-Checking this box will block parcel owners from listing their parcels in search
+			Checking this box will block parcel owners from listing their parcels in search
 Default: Off
 		</message>
 	</alert>
 	<alert modal="true" name="HelpParcelSearch" title="Do Not Show In Search">
 		<message name="message">
-Checking this box will show:
+			Checking this box will show:
 - this parcel in search results
-- this parcel's public objects
+- this parcel&apos;s public objects
 		</message>
 	</alert>
 	<alert modal="true" name="RegionMaturityChange" title="Changed Region Maturity">
@@ -3885,7 +3849,7 @@ Default: off
 		<message name="message">
 			Access to this estate will be limited to Residents 
 listed here and any groups below.  This setting is 
-only available when Visible from Mainland is 
+only available when Public Access is 
 unchecked.
 		</message>
 	</alert>
@@ -3893,19 +3857,27 @@ unchecked.
 		<message name="message">
 			Access to this estate will be limited to groups 
 listed here and any Residents above.  This setting is 
-only available when Visible from Mainland is 
+only available when Public Access is 
 unchecked.
 		</message>
 	</alert>
+	<alert modal="true" name="HelpEstateAbuseEmailAddress" title="Abuse Email Address">
+		<message name="message">
+			Setting this to a valid email address will cause 
+abuse reports on this estate to be sent to that address. 
+Setting it blank will cause abuse reports to be sent
+only to Linden Lab.
+		</message>
+	</alert>
 	<alert modal="true" name="HelpEstateBanResident" title="Deny Access">
 		<message name="message">
 			Residents on this list are denied access to your estate, 
-regardless of any other settings. 
+regardless of any other settings.
 		</message>
 	</alert>
 	<alert modal="true" name="HelpEstateVoiceChat" title="Allow Voice Chat">
-	    <message name="message">
-		    Parcels in this estate are allowed to have their own voice
+		<message name="message">
+			Parcels in this estate are allowed to have their own voice
 channels in which residents may hear and talk with others
 nearby.
 
@@ -3913,9 +3885,9 @@ Default: off
 		</message>
 	</alert>
 	<alert modal="true" name="VoiceVersionMismatch" title="Voice Version Mismatch">
-	    <message name="message">
-This version of Second Life is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update Second Life.
-	    </message>
+		<message name="message">
+			This version of Second Life is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update Second Life.
+		</message>
 	</alert>
 	<alert modal="true" name="HelpEstateCovenant" title="Estate Covenant">
 		<message name="message">
@@ -4140,7 +4112,7 @@ Move the inventory item(s)?
 	<alert name="ClickActionNotPayable">
 		<message name="message">
 			Warning: The Pay Object click action has been set, but it 
-will only work if a script is added with a money() event. 
+will only work if a script is added with a money() event.
 		</message>
 		<ignore name="ignore">
 			When Setting &apos;Pay&apos; on objects without money() events
@@ -4179,6 +4151,20 @@ will only work if a script is added with a money() event.
 			Cancel
 		</option>
 	</alert>
+	<alert modal="true" name="RetryFetchInventoryDescendents">
+		<message name="message">
+			Inventory fetch from server timed out.  Retry?
+		</message>
+		<ignore name="ignore">
+			Retry Fetch Inventory Descendents
+		</ignore>
+		<option name="Retry">
+			Retry
+		</option>
+		<option name="Cancel">
+			Cancel
+		</option>
+	</alert>
 	<alert modal="true" name="ConfirmQuit">
 		<message name="message">
 			Are you sure you want to quit?
@@ -4193,9 +4179,9 @@ will only work if a script is added with a money() event.
 			Continue
 		</option>
 	</alert>
-	<alert modal="true" name="HelpReportAbuseEmailLL" >
+	<alert modal="true" name="HelpReportAbuseEmailLL">
 		<message name="message">
-Use this tool to report violations of the Terms of Service 
+			Use this tool to report violations of the Terms of Service 
 and Community Standards. See:
 
 http://secondlife.com/corporate/tos.php 
@@ -4210,7 +4196,7 @@ http://secondlife.com/community/blotter.php
 	</alert>
 	<alert modal="true" name="HelpReportAbuseEmailEO">
 		<message name="message">
-IMPORTANT: This report will go to the owner of the 
+			IMPORTANT: This report will go to the owner of the 
 region you are currently in and not to Linden Lab.
 
 As a service to residents and visitors, the owner of 
@@ -4226,12 +4212,12 @@ About Land.)
 The resolution of this report applies only to this Region; 
 Residents access to other areas of Second Life will not be 
 affected by the outcome of this report. Only Linden Lab can 
-restrict access to the entirety of Second Life.		
+restrict access to the entirety of Second Life.
 		</message>
 	</alert>
 	<alert modal="true" name="HelpReportBug">
 		<message name="message">
-Use this tool to *only* report technical features that do not perform
+			Use this tool to *only* report technical features that do not perform
 as described or expected, please provide as much detail as possible,
 You may reply to the auto-response email to add more details to your
 report.
@@ -4393,6 +4379,17 @@ your cookies?
 			Cancel
 		</option>
 	</alert>
+	<alert modal="true" name="ConfirmClearMediaUrlList">
+		<message name="message">
+			Are you sure you want to clear your list of saved URLs?
+		</message>
+		<option default="true" name="Yes">
+			Yes
+		</option>
+		<option name="No">
+			Cancel
+		</option>
+	</alert>
 	<alert modal="true" name="ConfirmEmptyLostAndFound">
 		<message name="message">
 			Are you sure you want to permanently remove
@@ -4410,7 +4407,7 @@ the contents of your Lost And Found folder?
 	</alert>
 	<alert modal="true" name="CopySLURL">
 		<message name="message">
-The following SLURL has been copied to your clipboard:
+			The following SLURL has been copied to your clipboard:
  [SLURL] 
 
 Put it in a web page to give others easy access to this location or
@@ -4420,40 +4417,395 @@ try it out yourself by pasting it into the address bar of your web browser.
 			When copying a SLURL to your clipboard
 		</ignore>
 	</alert>
+	<alert modal="true" name="GraphicsPreferencesHelp">
+		<message name="message">
+			This panel controls window size and resolution and the quality of the client&apos;s graphics.  The graphics preferences interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. One may customize their graphics settings by checking the Custom checkbox and manipulating the following settings:
+
+Shaders: Enable or disable various types of pixel shaders. 
+
+Reflection Detail: Sets the types of objects that water can reflect.
+
+Avatar Rendering: Sets options that affect how the client renders avatars.
+
+Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.
+
+Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.
+
+Post Process Quality: Sets the resolution with which Glow is rendered. 
+
+Mesh Detail: Sets the amout of detail used in rendering certain objects.
+
+Lighting Detail: Selects what types of lights you would like to render.
+
+Terrain Detail: Sets the amount of terrain detail you would like to see. 
+
+Sky Detail: Sets the amount of tesselation of the sky dome.  A higher value takes longer to render, but makes the sun look more rounded.
+		</message>
+	</alert>
+	<alert modal="true" name="WLSavePresetAlert">
+		<message name="message">
+			Do you wish to overwrite the saved preset?
+		</message>
+		<option name="Save">
+			Yes
+		</option>
+		<option name="Cancel">
+			No
+		</option>
+	</alert>
+	<alert modal="true" name="WLDeletePresetAlert">
+		<message name="message">
+			Do you wish to delete [SKY]?
+		</message>
+		<option name="Delete">
+			Yes
+		</option>
+		<option name="Cancel">
+			No
+		</option>
+	</alert>
+	<alert modal="true" name="WLNoEditDefault">
+		<message name="message">
+			You cannot edit or delete a default preset.
+		</message>
+	</alert>
+	<alert modal="true" name="WLMissingSky">
+		<message name="message">
+			This day cycle file references a missing sky file: [SKY].
+		</message>
+	</alert>
+	<alert modal="true" name="PPSaveEffectAlert">
+		<message name="message">
+			PostProcess Effect exists. Do you still wish overwrite it?
+		</message>
+		<option name="Save">
+			Yes
+		</option>
+		<option name="Cancel">
+			No
+		</option>
+	</alert>
+	<alert modal="true" name="HelpEditSky">
+		<message name="message">
+			Edit the WindLight sliders to create and save a set of skies.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpEditDayCycle">
+		<message name="message">
+			Set which skies to turn to throughout the day.
+		</message>
+	</alert>
+	<alert modal="true" name="EnvSettingsHelpButton">
+		<message name="message">
+			These settings adjust the way the environment looks locally on your computer.  Your graphics card needs to support atmospheric shaders in order to have access to all of the settings.
+ 
+Adjust the &quot;Time of Day&quot; slider to change the day&apos;s phase locally on the viewer.
+ 
+Adjust the &quot;Cloud Cover&quot; slider to control how much the clouds cover the sky.
+ 
+Pick a color in the &quot;Water Color&quot; color picker to change the color of the water.
+ 
+Adjust the &quot;Water Fog&quot; slider to control how dense the fog is underwater.
+ 
+Click &quot;Use Estate Time&quot; to reset the time of day to the region&apos;s current time of day and remain linked to it.  
+ 
+Click &quot;Advanced Sky&quot; to bring up an editor with more advanced settings for the sky. 
+ 
+Click &quot;Advanced Water&quot; to bring up an editor with more advanced settings for the water.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpDayCycle">
+		<message name="message">
+			The Day Cycle Editor gives you control over the sky during Second Life&apos;s day/night cycle. This is the cycle that is used by the Basic Environment Editor&apos;s Time of Day slider.
+
+The Day Cycle Editor works by setting keyframes. These are nodes (represented by the gray blips on the time graph) that have Sky Presets associated with them. As the Time of Day progresses, the WindLight sky &quot;animates&quot; as it interpolates between these keyframes. 
+
+The yellow arrow above the timeline represents your current view, based on Time of Day. Click and drag it to see how your day will animate. You may add or delete keyframes by pressing the Add Key and Delete Key buttons to the right of the timeline.
+
+You can set the time position of a keyframe by either dragging it along the timeline, or by setting its value manually in the Key Frame Settings frame. Within the Key Frame Settings frame, you&apos;ll be able to associate the keyframe with its respective WindLight preset.
+
+Length of Cycle dictates the overall duration of a &quot;day&quot;. Setting this to a low value (for instance, 2 min.) will mean your entire 24-hour timeline will animate in only two real minutes! Once you are satisfied with your timeline and keyframe cycle, use the Play and Stop buttons to preview the results. Remember- you can also move the yellow time-indicator arrow above the timeline to see the cycle animate interactively. Using the Use Estate Time button will synchronize your day length and time of day with the Estate&apos;s day cycle.
+
+Once you are pleased with your Day Cycle, you can save and load it with the Save Test Day and Load Test Day buttons. Note that, for now, we only allow one Day Cycle.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpBlueHorizon">
+		<message name="message">
+			Use the Red/Green/Blue (RGB) sliders to adjust the color of the sky. You can use the Intensity (I) slider to move all three RGB sliders in unison.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpHazeHorizon">
+		<message name="message">
+			Haze Horizon is one of the most useful parameters for 
+adjusting overall light exposure in the scene.  It is
+effective for simulating many exposure settings,
+such as white-outs from the sun and darker, 
+closed-iris settings.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpBlueDensity">
+		<message name="message">
+			Blue Density affects the overall color saturation of the sky and fog. If you move the Intensity (I) slider to the right, colors will become brighter and more vibrant. If you move it all the way to the left, the colors will become duller, eventually fading to black and white. If you want to fine-tune the sky&apos;s color balance, you can control individual elements of saturation by using the Red/Green/Blue (RGB) sliders.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpHazeDensity">
+		<message name="message">
+			Haze Density controls the level of dull, gray
+haze in the atmosphere.  It is effective for 
+simulating scenes with high levels of smoke
+and man-made pollutants.  It is also effective
+for simulating fog and mist.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpDensityMult">
+		<message name="message">
+			The Density Multiplier can be used to affect the overall atmospheric density. At lower settings, it creates a feeling of &quot;thin air&quot;, and at higher settings, it creates a very heavy, smoggy effect.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpDistanceMult">
+		<message name="message">
+			Adjusts WindLight&apos;s perceived distance.  A value of
+zero effectively turns off WindLight&apos;s influence
+on terrain and objects.  Values greater than 1 simulate
+greater distances for thicker atmospheric effects.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpMaxAltitude">
+		<message name="message">
+			Max Altitude adjusts the altitude calculations WindLight
+performs when computing its atmospheric lighting.  At
+later times of day, it is useful for adjusting how
+&quot;deep&quot; the sunset appears.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpSunlightColor">
+		<message name="message">
+			Adjusts the color and intensity of the direct light in the scene.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpSunAmbient">
+		<message name="message">
+			Adjusts the color and intensity of ambient atmospheric light in the scene.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpSunGlow">
+		<message name="message">
+			The Size slider controls the size of the sun.
+The Focus slider controls how blurred the sun 
+is over the sky.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpSceneGamma">
+		<message name="message">
+			Adjust the screen&apos;s distribution of light and dark.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpStarBrightness">
+		<message name="message">
+			Adjusts the brightness of the stars in the sky.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpTimeOfDay">
+		<message name="message">
+			Controls the location of the sun in the sky.  
+Similar to elevation.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpEastAngle">
+		<message name="message">
+			Controls the location of the sun in the sky.  
+Similar to azimuth.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpCloudColor">
+		<message name="message">
+			Edits the color of the clouds.  It is generally
+recommended to keep it whitish,
+but hey, have fun if you want.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpCloudDetail">
+		<message name="message">
+			Controls the detail image layered on top
+of the main cloud image.  X and Y control
+its position.  D (Density) controls how puffy or 
+fractured the clouds appear.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpCloudDensity">
+		<message name="message">
+			Allows you to control the position of the clouds
+with the X and Y sliders and how dense they are
+with the the D slider.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpCloudCoverage">
+		<message name="message">
+			Controls how much the clouds cover the sky.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpCloudScale">
+		<message name="message">
+			Controls the scaling of the cloud image on the sky dome.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpCloudScrollX">
+		<message name="message">
+			Controls the speed of the clouds as they move in the X direction.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpCloudScrollY">
+		<message name="message">
+			Controls the speed of the clouds as they move in the Y direction.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpClassicClouds">
+		<message name="message">
+			Check this box to enable rendering of Second Life&apos;s older classic clouds in addition to WindLight&apos;s clouds.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterFogColor">
+		<message name="message">
+			Chooses the color of the underwater fog.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterFogDensity">
+		<message name="message">
+			Controls how dense the water fog is and how far you can see underwater.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpUnderWaterFogMod">
+		<message name="message">
+			Modifies the effect of the Fog Density Exponent to control how far you can see when your avatar is underwater.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterGlow">
+		<message name="message">
+			Controls how much the surface of the water glows.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterNormalScale">
+		<message name="message">
+			Controls the scaling of the three wavelets that make up the water.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterFresnelScale">
+		<message name="message">
+			Controls how much light is reflected at different angles.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterFresnelOffset">
+		<message name="message">
+			Controls how much light intensity is reflected.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterScaleAbove">
+		<message name="message">
+			Controls how much light is refracted from looking above the surface of the water.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterScaleBelow">
+		<message name="message">
+			Controls how much light is refracted from looking from below the surface of the water.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterBlurMultiplier">
+		<message name="message">
+			Controls how waves and reflections are mixed.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterNormalMap">
+		<message name="message">
+			Controls what normal map is layered across the water to determine reflections/refractions.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterWave1">
+		<message name="message">
+			Controls where and how fast the large scaled version of the normal map moves in the X and Y direction.
+		</message>
+	</alert>
+	<alert modal="true" name="HelpWaterWave2">
+		<message name="message">
+			Controls where and how fast the the small scaled version of the normal map moves in the X and Y direction.
+		</message>
+	</alert>
+	<alert name="NewSkyPreset">
+		<message name="message">
+			Give me a name for the new sky.
+		</message>
+		<editline>
+			New Preset
+		</editline>
+		<option name="OK">
+			OK
+		</option>
+		<option name="Cancel">
+			Cancel
+		</option>
+	</alert>
+	<alert modal="true" name="ExistsSkyPresetAlert">
+		<message name="message">
+			Preset already exists!
+		</message>
+	</alert>
+	<alert name="NewWaterPreset">
+		<message name="message">
+			Give me a name for the new water preset.
+		</message>
+		<editline>
+			New Preset
+		</editline>
+		<option name="OK">
+			OK
+		</option>
+		<option name="Cancel">
+			Cancel
+		</option>
+	</alert>
+	<alert modal="true" name="ExistsWaterPresetAlert">
+		<message name="message">
+			Preset already exists!
+		</message>
+	</alert>
+	<alert modal="true" name="WaterNoEditDefault">
+		<message name="message">
+			You cannot edit or delete a default preset.
+		</message>
+	</alert>
 	<alert modal="true" name="ChatterBoxSessionStartError">
-	    <message name="message">
-		    Error starting a new chat session with [RECIPIENT].
+		<message name="message">
+			Error starting a new chat session with [RECIPIENT].
 [REASON]
 		</message>
 		<option default="true" name="OK">
-		    OK
+			OK
 		</option>
 	</alert>
 	<alert modal="true" name="ChatterBoxSessionStartNotVerified">
-	    <message name="message">
-		    Error starting a new chat session with [RECIPIENT].
+		<message name="message">
+			Error starting a new chat session with [RECIPIENT].
 [REASON]
 		</message>
 		<option default="true" name="OK">
-		    OK
+			OK
 		</option>
 	</alert>
 	<alert modal="true" name="ChatterBoxSessionEventError">
-	    <message name="message">
-		    Error [EVENT] [RECIPIENT].
+		<message name="message">
+			Error [EVENT] [RECIPIENT].
 [REASON]
 		</message>
 		<option default="true" name="OK">
-		    OK
+			OK
 		</option>
 	</alert>
 	<alert modal="true" name="ForceCloseChatterBoxSession">
-	    <message name="message">
-		    Your chat session with [NAME] must close.
+		<message name="message">
+			Your chat session with [NAME] must close.
 [REASON]
 		</message>
 		<option default="true" name="OK">
-		    OK
+			OK
 		</option>
 	</alert>
 	<alert modal="true" name="Cannot_Purchase_an_Attachment">
@@ -4462,10 +4814,10 @@ try it out yourself by pasting it into the address bar of your web browser.
 			they are part of an attachment.
 		</message>
 	</alert>
-	<!-- alert for more information about the debit permission -->
-	<alert modal="true" name="DebitPermissionDetails" title="About Requests for the Debit Permission">
+	<alert modal="true" name="DebitPermissionDetails"
+	     title="About Requests for the Debit Permission">
 		<message name="message">
-			<p>Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.</p>
+			Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.
 		</message>
 		<option default="true" name="OK">
 			OK
@@ -4485,9 +4837,9 @@ try it out yourself by pasting it into the address bar of your web browser.
 			No
 		</option>
 	</alert>
-		<alert modal="true" name="BadURL">
+	<alert modal="true" name="BadURL">
 		<message name="message">
-Second Life doesn't know how to handle the link:
+			Second Life doesn&apos;t know how to handle the link:
  [SLURL]
 Most links are similar to this:
 
@@ -4513,7 +4865,9 @@ Would you like to visit the Second Life website to verify your age?
 		<option name="No">
 			No
 		</option>
-		<url option="0">https://secondlife.com/account/verification.php</url>
+		<url option="0">
+			https://secondlife.com/account/verification.php
+		</url>
 	</alert>
 	<alert modal="true" name="Cannot enter parcel: no payment info on file">
 		<message name="message">
@@ -4531,7 +4885,8 @@ Would you like to visit the Second Life website to set this up?
 		<option name="No">
 			No
 		</option>
-		<url option="0">https://secondlife.com/account/</url>
+		<url option="0">
+			https://secondlife.com/account/
+		</url>
 	</alert>
 </alerts>
-
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/xui/en-us/floater_about.xml
index d01ef3f..e9253ff 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about.xml
@@ -7,7 +7,8 @@
 	     follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
 	     max_length="65536" mouse_opaque="true" name="credits_editor"
 	     text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
-	     word_wrap="true">Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
+	     word_wrap="true">
+		Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
 
 Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
 
@@ -31,12 +32,14 @@ All rights reserved.  See licenses.txt for details.
 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-Happiness is a warm puppy. -- Charles M. Schulz</text_editor>
-
+Happiness is a warm puppy. -- Charles M. Schulz
+	</text_editor>
 	<text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false"
 	     follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
 	     max_length="65536" mouse_opaque="true" name="support_editor"
 	     text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
 	     word_wrap="true" />
-	<text hidden="true" name="you_are_at">You are at [POSITION]</text>
+	<string name="you_are_at">
+		You are at [POSITION]
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
index 85ac175..7e7c2f8 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
@@ -1,561 +1,554 @@
 <?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="true" can_tear_off="false" enabled="true" height="385"
-     hidden="false" left="367" min_height="385" min_width="460"
-     mouse_opaque="true" name="floaterland" rect_control="FloaterLandRect5"
-     title="About Land" width="460">
-	<tab_container bottom="-370" enabled="true" height="350" hidden="false" left="0"
-	     mouse_opaque="false" name="landtab" tab_position="top" width="460" follows="left|top|right|bottom">
+     can_resize="true" can_tear_off="true" 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="-390" enabled="true" follows="left|top|right|bottom" height="370"
+	     left="0" mouse_opaque="false" name="landtab" tab_position="top" width="460">
 		<panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" hidden="false" label="General" left="1" mouse_opaque="true"
+		     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" hidden="false"
-			     left="4" mouse_opaque="true" name="Name:" v_pad="0" width="72">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="Name:" v_pad="0" width="72">
 				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" hidden="false" left="78"
-			     max_length="63" mouse_opaque="true" name="Name"
-			     select_all_on_focus_received="false" select_on_focus="false"
-			     text_readonly_color="0.576471 0.662745 0.835294 1" width="368" />
+			     handle_edit_keys_directly="false" height="16" left="78" max_length="63"
+			     mouse_opaque="true" name="Name" select_all_on_focus_received="false"
+			     select_on_focus="false" text_readonly_color="0.576471 0.662745 0.835294 1"
+			     width="368" />
 			<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" hidden="false"
-			     left="4" mouse_opaque="true" name="Description:" v_pad="0" width="80">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="Description:" v_pad="0" width="80">
 				Description:
 			</text>
 			<text_editor type="string" bevel_style="in" border_style="line" border_thickness="1" bottom="-76"
-			     enabled="true" follows="left|top|right" font="SansSerifSmall"
-			     handle_edit_keys_directly="false" height="52" hidden="false" left="76"
-			     max_length="255" mouse_opaque="true" name="Description"
+			     embedded_items="false" enabled="true" follows="left|top|right"
+			     font="SansSerifSmall" handle_edit_keys_directly="false" height="52"
+			     left="76" max_length="255" mouse_opaque="true" name="Description"
 			     select_all_on_focus_received="false" select_on_focus="false"
-			     text_readonly_color="0.576471 0.662745 0.835294 1" width="370" word_wrap="true" 
-			     embedded_items="false" />
+			     text_readonly_color="0.576471 0.662745 0.835294 1" width="370"
+			     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" hidden="false"
-			     left="4" mouse_opaque="true" name="Owner:" v_pad="0" width="72">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="Owner:" v_pad="0" width="72">
 				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" hidden="false"
-			     left="76" mouse_opaque="true" name="OwnerText" v_pad="0" width="292">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="OwnerText" v_pad="0" width="292">
 				Leyla Linden
 			</text>
 			<button bottom="-100" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Profile..."
-			     label_selected="Profile..." left="350" mouse_opaque="true"
-			     name="Profile..." scale_image="true" width="90" />
+			     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="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="4" mouse_opaque="true" name="Group:" v_pad="0" width="72">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="Group:" v_pad="0" width="72">
 				Group:
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-122" drop_shadow_visible="true" enabled="false" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="76" mouse_opaque="true" name="GroupText" v_pad="0" width="110" />
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="GroupText" v_pad="0" width="110" />
 			<button bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Set..."
-			     label_selected="Set..." left="350" mouse_opaque="true" name="Set..."
-			     scale_image="true" width="90" />
+			     halign="center" height="16" label="Set..." label_selected="Set..."
+			     left="350" mouse_opaque="true" name="Set..." scale_image="true" width="90" />
 			<check_box bottom="-140" enabled="false" follows="left|top" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false"
-			     label="Allow Deed to Group" left="76" mouse_opaque="true" name="check deed"
-			     radio_style="false"
+			     height="16" initial_value="false" label="Allow Deed to Group" left="76"
+			     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="136" />
 			<button bottom="-140" enabled="false" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Deed..."
-			     label_selected="Deed..." left="350" mouse_opaque="true" name="Deed..."
-			     scale_image="true"
+			     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="-160" enabled="false" follows="left|top" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false"
+			     height="16" initial_value="false"
 			     label="Owner Makes Contribution With Deed" left="76" 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="219" />
 			<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" hidden="false"
-			     left="4" mouse_opaque="true" name="For Sale:" v_pad="0" width="72">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="For Sale:" v_pad="0" width="72">
 				For Sale:
 			</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" hidden="false"
-			     left="76" mouse_opaque="true" name="Not for sale." v_pad="0" width="206">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="Not for sale." v_pad="0" width="206">
 				Not for sale.
 			</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" hidden="false"
-			     left="76" mouse_opaque="true" name="For Sale: Price L$[PRICE]." v_pad="0"
-			     width="206">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="For Sale: Price L$[PRICE]." v_pad="0" width="206">
 				Price: L$[PRICE].
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-200" drop_shadow_visible="true" enabled="false" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="76" mouse_opaque="true" name="SalePending" v_pad="0" width="364" />
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="SalePending" v_pad="0" width="364" />
 			<button bottom="-204" enabled="true" follows="left|top" font="SansSerif"
-			     halign="center" height="20" hidden="false" label="Sell Land..."
+			     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="-200" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="76" mouse_opaque="true" name="For sale to" v_pad="0" width="206">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="For sale to" v_pad="0" width="206">
 				For sale to: [BUYER]
 			</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" hidden="false"
-			     left="76" mouse_opaque="true"
-			     name="Sell with landowners objects in parcel." v_pad="0" width="206">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="Sell with landowners objects in parcel."
+			     v_pad="0" width="206">
 				Objects included in 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" hidden="false"
-			     left="76" mouse_opaque="true" name="Selling with no objects in parcel."
-			     v_pad="0" width="206">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="Selling with no objects in parcel." v_pad="0"
+			     width="206">
 				Objects not included in sale.
 			</text>
 			<button bottom="-208" enabled="true" follows="left|top" font="SansSerif"
-			     halign="center" height="20" hidden="false" label="Cancel Land Sale"
+			     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="-244" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="4" mouse_opaque="true" name="Claimed:" v_pad="0" width="72">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="Claimed:" v_pad="0" width="72">
 				Claimed:
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-244" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="76" mouse_opaque="true" name="DateClaimText" v_pad="0" width="206">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="DateClaimText" v_pad="0" width="206">
 				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="-264" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="4" mouse_opaque="true" name="PriceLabel" v_pad="0" width="72">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="PriceLabel" v_pad="0" width="72">
 				Area:
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-264" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="76" mouse_opaque="true" name="PriceText" v_pad="0" width="206">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="PriceText" v_pad="0" width="206">
 				4048 sq. m.
 			</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" hidden="false"
-			     left="4" mouse_opaque="true" name="Traffic:" v_pad="0" width="72">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="Traffic:" v_pad="0" width="72">
 				Traffic:
 			</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" hidden="false"
-			     left="76" mouse_opaque="true" name="DwellText" v_pad="0" width="206">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+			     mouse_opaque="true" name="DwellText" v_pad="0" width="206">
 				0
 			</text>
 			<button bottom="-308" enabled="false" follows="left|top" font="SansSerif"
-			     halign="center" height="20" hidden="false" label="Buy Land..."
+			     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="-332" enabled="false" follows="left|top" font="SansSerif"
-			     halign="center" height="20" hidden="false" label="Buy For Group..."
+			     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="-332" enabled="false" follows="left|top" font="SansSerif"
-			     halign="center" height="20" hidden="false" label="Buy Pass..."
+			     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="-308" enabled="true" follows="left|top" font="SansSerif"
-			     halign="center" height="20" hidden="false" label="Abandon Land..."
+			     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="-260" enabled="true" follows="left|top" font="SansSerif"
-			     halign="center" height="20" hidden="false" label="Reclaim Land..."
+			     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="-284" enabled="false" follows="left|top" font="SansSerif"
-			     halign="center" height="20" hidden="false" label="Linden Sale..."
+			     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" />
-			<text hidden="true" name="new users only">New users only</text>
-			<text hidden="true" name="anyone">Anyone</text>
-			<text hidden="true" name="area_text">Area</text>
-			<text hidden="true" name="area_size_text">[AREA] sq. m.</text>
-			<text hidden="true" name="auction_id_text">Auction ID: [ID]</text>
-			<text hidden="true" name="need_tier_to_modify">You must approve your purchase to modify this land.</text>
-			<text hidden="true" name="group_owned_text">(Group Owned)</text>
-			<text hidden="true" name="profile_text">"Profile..."</text>
-			<text hidden="true" name="info_text">"Info..."</text>
-			<text hidden="true" name="public_text">(public)</text>
-			<text hidden="true" name="none_text">(none)</text>
-			<text hidden="true" name="sale_pending_text"> (Sale Pending)</text>
+			<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>
 		</panel>
 		<panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" hidden="false" label="Covenant" left="1" mouse_opaque="true"
+		     height="333" label="Covenant" left="1" 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="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
-			     left="180" mouse_opaque="false" name="covenant_timestamp_text" v_pad="0"
-			     width="250">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="180"
+			     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="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
-			     left="10" mouse_opaque="false" name="region_name_lbl" v_pad="0" width="100">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+			     mouse_opaque="false" name="region_name_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="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
-			     left="120" mouse_opaque="false" name="region_name_text" v_pad="0"
-			     width="150">
+			     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="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
-			     left="10" mouse_opaque="false" name="estate_name_lbl" v_pad="0" width="100">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+			     mouse_opaque="false" name="estate_name_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="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
-			     left="120" mouse_opaque="false" name="estate_name_text" v_pad="0"
-			     width="150">
+			     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="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
-			     left="10" mouse_opaque="false" name="estate_owner_lbl" v_pad="0"
-			     width="100">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+			     mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
 				Estate Owner:
 			</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="20" hidden="false"
-			     left="120" mouse_opaque="false" name="estate_owner_text" v_pad="0"
-			     width="150">
+			     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 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="SansSerif" h_pad="0" halign="left" height="20" hidden="false"
-			     left="05" mouse_opaque="false" name="resellable_clause" v_pad="0"
-			     width="485">
+			     font="SansSerif" h_pad="0" halign="left" height="20" left="05"
+			     mouse_opaque="false" name="resellable_clause" v_pad="0" width="485">
 				Purchased 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="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerif" h_pad="0" halign="left" height="20" hidden="false"
-			     left="05" mouse_opaque="false" name="changeable_clause" v_pad="0"
-			     width="485">
+			     font="SansSerif" h_pad="0" halign="left" height="20" left="05"
+			     mouse_opaque="false" name="changeable_clause" v_pad="0" width="485">
 				Purchased land in this region may not be joined/subdivided.
 			</text>
-			<text_editor type="string" length="1" bottom="-325" embedded_items="false" enabled="false" follows="left|top|right|bottom"
-			     font="SansSerifSmall" height="200" hidden="false" left="15"
-			     max_length="65535" mouse_opaque="true" name="covenant_editor"
+			<text_editor type="string" length="1" bottom="-325" embedded_items="false" enabled="false"
+			     follows="left|top|right|bottom" font="SansSerifSmall" height="200"
+			     left="15" max_length="65535" mouse_opaque="true" name="covenant_editor"
 			     text_readonly_color="1 1 1 1" width="420" word_wrap="true">
 				There is no Covenant provided for this Estate.
 			</text_editor>
-			<text hidden="true" name="can_resell">
+			<string name="can_resell">
 				Purchased land in this region may be resold.
-			</text>
-			<text hidden="true" name="can_not_resell">
+			</string>
+			<string name="can_not_resell">
 				Purchased land in this region may not be resold.
-			</text>
-			<text hidden="true" name="can_change">
+			</string>
+			<string name="can_change">
 				Purchased land in this region may be joined or subdivided.
-			</text>
-			<text hidden="true" name="can_not_change">
+			</string>
+			<string name="can_not_change">
 				Purchased land in this region may not be joined or subdivided.
-			</text>
+			</string>
 		</panel>
 		<panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" hidden="false" label="Objects" left="1" mouse_opaque="true"
+		     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" hidden="false"
-			     left="4" mouse_opaque="true" name="parcel_object_bonus"
-			     v_pad="0" width="364" visible="fakse">
-			        Region Object Bonus Factor: [BONUS]
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="fakse"
+			     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" hidden="false"
-			     left="4" mouse_opaque="true" name="Simulator primitive usage:" v_pad="0"
-			     width="364">
+			     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" hidden="false"
-			     left="156" mouse_opaque="true" name="objects_available" v_pad="0"
-			     width="212">
+			     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>
-			<text hidden="true" name="objects_available_text">
+			<string name="objects_available_text">
 				[COUNT] out of [MAX] ([AVAILABLE] available)
-			</text>
-			<text hidden="true" name="objects_deleted_text">
+			</string>
+			<string name="objects_deleted_text">
 				[COUNT] out of [MAX] ([DELETED] will be deleted)
-			</text>
+			</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" hidden="false"
-			     left="4" mouse_opaque="true" name="Primitives parcel supports:" v_pad="0"
+			     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" hidden="false"
-			     left="156" mouse_opaque="true" name="object_contrib_text" v_pad="0"
-			     width="212">
+			     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" hidden="false"
-			     left="4" mouse_opaque="true" name="Primitives on parcel:" v_pad="0"
-			     width="152">
+			     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" hidden="false"
-			     left="156" mouse_opaque="true" name="total_objects_text" v_pad="0"
-			     width="48">
+			     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" hidden="false"
-			     left="28" mouse_opaque="true" name="Owned by parcel owner:" v_pad="0"
-			     width="128">
+			     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" hidden="false"
-			     left="156" mouse_opaque="true" name="owner_objects_text" v_pad="0"
-			     width="48">
+			     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" hidden="false" label="Show"
-			     label_selected="Show" right="-190" mouse_opaque="true" name="ShowOwner"
-			     scale_image="true" width="60" />
+			     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" hidden="false" label="Return..."
-			     label_selected="Return..." right="-60" mouse_opaque="true"
-			     name="ReturnOwner..." scale_image="true"
+			     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" hidden="false"
-			     left="28" mouse_opaque="true" name="Set to group:" v_pad="0" width="128">
+			     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" hidden="false"
-			     left="156" mouse_opaque="true" name="group_objects_text" v_pad="0"
-			     width="48">
+			     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" hidden="false" label="Show"
-			     label_selected="Show" right="-190" mouse_opaque="true" name="ShowGroup"
-			     scale_image="true" width="60" />
+			     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" hidden="false" label="Return..."
-			     label_selected="Return..." right="-60" mouse_opaque="true"
-			     name="ReturnGroup..." scale_image="true"
+			     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" hidden="false"
-			     left="28" mouse_opaque="true" name="Owned by others:" v_pad="0" width="128">
+			     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" hidden="false"
-			     left="156" mouse_opaque="true" name="other_objects_text" v_pad="0"
-			     width="48">
+			     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" hidden="false" label="Show"
-			     label_selected="Show" right="-190" mouse_opaque="true" name="ShowOther"
-			     scale_image="true" width="60" />
+			     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" hidden="false" label="Return..."
-			     label_selected="Return..." right="-60" mouse_opaque="true"
-			     name="ReturnOther..." scale_image="true"
+			     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" hidden="false"
-			     left="28" mouse_opaque="true" name="Selected / sat upon:" v_pad="0"
-			     width="128">
+			     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" hidden="false"
-			     left="156" mouse_opaque="true" name="selected_objects_text" v_pad="0"
-			     width="48">
+			     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" hidden="false"
-			     left="4" mouse_opaque="true"
-			     name="Autoreturn"
-			     v_pad="0" width="294">
+			     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" hidden="false" right="-100"
-			     max_length="6" mouse_opaque="true" name="clean other time"
+			     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" hidden="false"
-			     left="4" mouse_opaque="true" name="Object Owners:" v_pad="0" width="104">
+			     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" hidden="false" label="Refresh List"
+			     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" hidden="false" label="Return objects..."
+			     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="false" bottom="-329" draw_heading="true"
-			     column_padding="0" draw_border="true"
+			<name_list allow_calling_card_drop="false" background_visible="false" bottom="-329"
+			     column_padding="0" draw_border="true" draw_heading="true"
 			     draw_stripes="true" enabled="true" fg_disable_color="1 1 1 1"
 			     fg_selected_color="1 1 1 1" fg_unselected_color="1 1 1 1"
-			     follows="left|top|right|bottom" height="117" hidden="false" left="4"
-			     mouse_opaque="true" multi_select="false" name="owner list"
-			     name_column_index="2" width="450">
-        <column width="24" label="Type" sort="online_status"/>
-        <column width="-1" name="online_status"/>
-        <column dynamicwidth="true" label="Name"/>
-        <column width="70" label="Count"/>
-      </name_list>/>
+			     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 label="Type" sort="online_status" width="24" />
+				<column name="online_status" width="-1" />
+				<column dynamicwidth="true" label="Name" />
+				<column label="Count" width="70" />
+			</name_list>
+			/&gt;
 		</panel>
 		<panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" hidden="false" label="Options" left="1" mouse_opaque="true"
+		     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" hidden="false"
-			     left="4" mouse_opaque="true" name="allow_label" v_pad="0" width="278">
+			     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" hidden="false" initial_value="false" label="Edit Terrain"
-			     left="14" mouse_opaque="true" name="edit land check" radio_style="false"
-			     width="268" />
+			     height="16" initial_value="false" label="Edit Terrain" left="14"
+			     mouse_opaque="true" name="edit land check" radio_style="false" width="268" />
 			<check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false" label="Create Landmarks"
-			     left="14" mouse_opaque="true" name="check landmark" radio_style="false"
-			     width="268" />
+			     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" hidden="false" initial_value="false" label="Fly" left="14"
-			     mouse_opaque="true" name="check fly" radio_style="false" width="268" />
+			     height="16" initial_value="false" label="Fly" left="14" mouse_opaque="true"
+			     name="check fly" radio_style="false" 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" hidden="false"
-			     left="178" mouse_opaque="true" name="allow_label2" v_pad="0" width="104">
+			     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" hidden="false" initial_value="false" label="All Residents"
-			     left="270" mouse_opaque="true" name="edit objects check"
-			     radio_style="false" width="104" />
+			     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" hidden="false" initial_value="false" label="Group" left="370"
+			     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" hidden="false"
-			     left="178" mouse_opaque="true" name="allow_label3" v_pad="0" width="124">
+			     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" hidden="false" initial_value="false" label="All Residents"
-			     left="270" mouse_opaque="true" name="all object entry check"
-			     radio_style="false" width="120" />
+			     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" hidden="false" initial_value="false" label="Group" left="370"
+			     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" hidden="false"
-			     left="178" mouse_opaque="true" name="allow_label4" v_pad="0" width="124">
+			     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" hidden="false" initial_value="false" label="All Residents"
-			     left="270" mouse_opaque="true" name="check other scripts"
-			     radio_style="false" width="120" />
+			     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" hidden="false" initial_value="false" label="Group" left="370"
+			     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" hidden="false"
-			     left="4" mouse_opaque="true" name="land_options_label" v_pad="0"
-			     width="278">
+			     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" hidden="false" initial_value="false" label="Safe (no damage)"
-			     left="14" mouse_opaque="true" name="check safe" radio_style="false"
-			     width="268" />
+			     height="16" initial_value="false" label="Safe (no damage)" left="14"
+			     mouse_opaque="true" name="check safe" radio_style="false" width="268" />
 			<check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false" label="Restrict Pushing"
-			     left="178" mouse_opaque="true" name="PushRestrictCheck" radio_style="false"
+			     height="16" initial_value="false" label="Restrict Pushing" left="178"
+			     mouse_opaque="true" name="PushRestrictCheck" radio_style="false"
 			     tool_tip="llPushObject will only work through parcel owner scripts or on scripts where the pushee is the script owner."
 			     width="119" />
 			<check_box bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false"
+			     height="16" initial_value="false"
 			     label="Show Place in Search (L$30/week) under" left="14"
 			     mouse_opaque="true" name="ShowDirectoryCheck" radio_style="false"
-			     width="268" tool_tip="Let people see this parcel in search results"/>
+			     tool_tip="Let people see this parcel in search results" width="268" />
 			<combo_box allow_text_entry="false" bottom="-140" enabled="true" follows="left|top"
-			     height="18" hidden="false" left="255" max_chars="20" mouse_opaque="true"
+			     height="18" left="255" max_chars="20" mouse_opaque="true"
 			     name="land category" width="130">
 				<combo_item name="AnyCategory" value="any">
 					Any Category
@@ -598,48 +591,49 @@
 				</combo_item>
 			</combo_box>
 			<button bottom="-140" enabled="true" follows="left|top" font="SansSerif"
-			     halign="center" height="16" hidden="false" label="?" label_selected="?"
-			     left="400" mouse_opaque="true" name="?" width="20" />
+			     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" hidden="false" initial_value="false" label="Mature Content"
-			     left="14" mouse_opaque="true" name="MatureCheck" radio_style="false"
-			     tool_tip="Your parcel information or content is considered mature." width="107" />
+			     height="16" initial_value="false" label="Mature Content" left="14"
+			     mouse_opaque="true" name="MatureCheck" radio_style="false"
+			     tool_tip="Your parcel information or content is considered mature."
+			     width="107" />
 			<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" hidden="false"
-			     left="4" mouse_opaque="true" name="Snapshot:" v_pad="0" width="278">
+			     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"
-			     hidden="false" label="" left="76" mouse_opaque="true" name="snapshot_ctrl"
+			     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" hidden="false"
-			     left="4" mouse_opaque="true" name="landing_point" v_pad="0"
-			     width="278">
+			     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>
-			<text hidden="true" name="landing_point_none">"(none)"</text>
+			<string name="landing_point_none">
+				(none)
+			</string>
 			<button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Set" label_selected="Set"
-			     left="236" mouse_opaque="true" name="Set" scale_image="true"
+			     halign="center" height="16" label="Set" label_selected="Set" left="236"
+			     mouse_opaque="true" name="Set" scale_image="true"
 			     tool_tip="Set the landing point to your avatar&apos;s location. It must be inside this land parcel."
 			     width="50" />
 			<button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Clear"
-			     label_selected="Clear" left="291" mouse_opaque="true" name="Clear"
-			     scale_image="true" tool_tip="Clear the landing point." width="50" />
+			     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" hidden="false"
-			     left="4" mouse_opaque="true" name="Teleport Routing: " v_pad="0"
-			     width="278">
+			     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" hidden="false" left="120" max_chars="20" mouse_opaque="true"
+			     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">
@@ -653,143 +647,195 @@
 					Anywhere
 				</combo_item>
 			</combo_box>
-			<text hidden="true" name="push_restrict_text">"Restrict Pushing"</text>
-			<text hidden="true" name="push_restrict_region_text">"Restrict Pushing (Region Override)"</text>
+			<string name="push_restrict_text">
+				Restrict Pushing
+			</string>
+			<string name="push_restrict_region_text">
+				Restrict Pushing (Region Override)
+			</string>
 		</panel>
 		<panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" hidden="false" label="Media" left="1" mouse_opaque="true"
+		     height="363" label="Media" left="1" mouse_opaque="true"
 		     name="land_media_panel" width="458">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="4" mouse_opaque="true" name="Media texture:" v_pad="0" width="364">
-				Media
-texture:
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="80" mouse_opaque="true" name="Replace this texture:" v_pad="0"
-			     width="292">
-				Replace this texture:
-			</text>
-			<texture_picker allow_no_texture="true" bottom_delta="-68" can_apply_immediately="false"
-			     default_image_name="Default" enabled="true" follows="left|top" height="64"
-			     hidden="false" label="" left="76" mouse_opaque="true" name="media texture"
-			     tool_tip="Click to choose a picture" width="64" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-10" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="80" mouse_opaque="true" name="with content from this URL:" v_pad="0"
-			     width="292">
-				with content from this URL:
+			<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="-18"
-			     enabled="true" follows="left|top|right" font="SansSerifSmall"
-			     handle_edit_keys_directly="false" height="16" hidden="false" left="76"
-			     max_length="255" mouse_opaque="true" name="media_url"
+			<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"
-			     text_readonly_color="0.576471 0.662745 0.835294 1" width="370" />
-			<check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false"
-			     label="Auto scale content (slower and reduced visual quality)" left="76"
+			     text_readonly_color="0.576471 0.662745 0.835294 1"
+			     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="308" />
-   			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-45" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="Media texture:" v_pad="0" width="364">
-				Sound
-Settings:
-			</text>
-   			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="80" mouse_opaque="true" name="Music URL:" v_pad="0" width="364">
+			     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="-18"
-			     enabled="true" follows="left|right|top" font="SansSerifSmall"
-			     handle_edit_keys_directly="false" height="16" hidden="false" left="76"
-			     max_length="255" mouse_opaque="true" name="music_url"
+			<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_readonly_color="0.576471 0.662745 0.835294 1" width="370" />
-
-   			<check_box bottom_delta="-26" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false"
-			     label="Restrict spatialized sound to this parcel" left="76"
+			     text_readonly_color="0.576471 0.662745 0.835294 1" />
+			<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 spatialized sound to this parcel" left="80"
 			     mouse_opaque="true" name="check sound local" radio_style="false"
 			     width="292" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-268" enabled="true" follows="left|top" font="SansSerifSmall"
-			     h_pad="0" halign="left" height="16" hidden="false" left="8"
-			     mouse_opaque="false" name="Voice settings:" tab_stop="false" v_pad="0"
-			     width="364">
-				Voice
-Settings:
-			</text>
-			<radio_group bottom="-306" draw_border="true" enabled="true" follows="left|top" height="54"
-			     hidden="false" left="80" mouse_opaque="true" name="parcel_voice_channel"
-			     tab_stop="true" width="370">
-				<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
-				     left="3" mouse_opaque="true" name="Estate" width="463">
+			     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>
+			<radio_group bottom_delta="-40" draw_border="true" enabled="true" follows="left|top"
+			     height="54" left="80" mouse_opaque="true" name="parcel_voice_channel"
+			     tab_stop="true" width="219">
+				<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="3"
+				     mouse_opaque="true" name="Estate" width="463">
 					Use the Estate spatial channel
 				</radio_item>
-				<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
-				     left="3" mouse_opaque="true" name="Private" width="463">
+				<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" left="3"
+				     mouse_opaque="true" name="Private" width="463">
 					Use a private spatial channel
 				</radio_item>
-				<radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" hidden="false"
-				     left="3" mouse_opaque="true" name="Disabled" width="463">
+				<radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" left="3"
+				     mouse_opaque="true" name="Disabled" width="463">
 					Disable spatial audio on this parcel
 				</radio_item>
 			</radio_group>
 		</panel>
 		<panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" hidden="false" label="Access" left="1" mouse_opaque="true"
+		     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"
+			<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" hidden="false"
-			     left="8" mouse_opaque="true" name="Limit access to this parcel to:"
-			     v_pad="0" width="278">
-			        Access To This Parcel
+			     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" hidden="false" initial_value="false" label="Allow Public Access"
-			     left="8" mouse_opaque="true" name="public_access" radio_style="false"
-			     width="278" />
+			     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" hidden="false"
-			     left_delta="20" mouse_opaque="true" name="Only Allow"
-			     v_pad="0" width="278">
+			     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" hidden="false" 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" width="278" 
-			     tool_tip="Ban unidentified residents." />
+			     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" hidden="false" initial_value="false" label="Residents who are not age verified adults"
-			     left_delta="0" mouse_opaque="true" name="limit_age_verified" radio_style="false" width="278"
-			     tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information." />
-			<string name="estate_override">One ore more of these options is set at the estate level</string>
-
+			     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 ore 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" hidden="false" initial_value="false" label="Allow Group Access: [GROUP]"
-			     left="8" mouse_opaque="true" name="GroupCheck" radio_style="false" width="278"
-			     tool_tip="Set group in the General tab." />
-
+			     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" hidden="false" initial_value="false"
-			     label="Sell passes to:" left="8"
-			     mouse_opaque="true" name="PassCheck" radio_style="false" width="120" 
-			     tool_tip="Allows temporary access to this parcel"/>
+			     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" hidden="false" left_delta="142" max_chars="20" mouse_opaque="true"
+			     height="16" left_delta="142" max_chars="20" mouse_opaque="true"
 			     name="pass_combo" width="100">
 				<combo_item name="Anyone" value="anyone">
 					Anyone
@@ -798,104 +844,50 @@ Settings:
 					Group
 				</combo_item>
 			</combo_box>
-			<spinner bottom_delta="-20" enabled="false" follows="left|top" height="16" hidden="false"
-			     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" hidden="false"
+			<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" />
-
-
+			     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" hidden="false" initial_value="false"
-			     label="Always Allow" left="20" mouse_opaque="true"
-			     name="AccessCheck" radio_style="false" width="195">
-			  Allowed Residents
+			     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="-320"
-			     column_padding="0" draw_border="true" draw_heading="false" heading_font="SansSerifSmall" heading_height="14"
-			     enabled="true" follows="left|top" height="100"
-			     hidden="false" left="20" mouse_opaque="true" multi_select="true"
-			     name="AccessList" width="195"
-			     tool_tip="([LISTED] listed, [MAX] max)">
-			</name_list>
+			     column_padding="0" draw_border="true" draw_heading="false" enabled="true"
+			     follows="left|top" heading_font="SansSerifSmall" heading_height="14"
+			     height="100" 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="left|top" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Add..."
-			     label_selected="Add..." left_delta="5" mouse_opaque="true" name="add_allowed"
-			     scale_image="true" width="80" />
+			     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="left|top" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Remove"
-			     label_selected="Remove" left_delta="100" mouse_opaque="true" name="remove_allowed"
+			     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" hidden="false" initial_value="false"
-			     label="Ban" left="240" mouse_opaque="true"
-			     name="AccessCheck" radio_style="false" width="195">
-			  Banned Residents
+			     height="16" initial_value="false" label="Ban" left="240"
+			     mouse_opaque="true" name="BannedText" radio_style="false" width="195">
+				Banned Residents
 			</text>
 			<name_list allow_calling_card_drop="false" background_visible="true" bottom="-320"
-			     column_padding="0" draw_border="true" draw_heading="false" heading_font="SansSerifSmall" heading_height="14"
-			     enabled="true" follows="left|right|top|bottom" height="100"
-			     hidden="false" left_delta="0" mouse_opaque="true" multi_select="true"
-			     name="BannedList" width="195"
-			     tool_tip="([LISTED] listed, [MAX] max)">
-			</name_list>
+			     column_padding="0" draw_border="true" draw_heading="false" enabled="true"
+			     follows="left|right|top|bottom" heading_font="SansSerifSmall"
+			     heading_height="14" height="100" 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="right|bottom" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Add..."
-			     label_selected="Add..." left_delta="5" mouse_opaque="true" name="add_banned"
-			     scale_image="true" width="80" />
+			     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="right|bottom" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Remove"
-			     label_selected="Remove" left_delta="100" mouse_opaque="true" name="remove_banned"
+			     halign="center" height="16" label="Remove" label_selected="Remove"
+			     left_delta="100" mouse_opaque="true" name="remove_banned"
 			     scale_image="true" width="80" />
-
-		</panel>
-<!--
-		<panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
-		     height="333" hidden="false" label="Ban" left="1" mouse_opaque="true"
-		     name="land_ban_panel" width="458">
-			<check_box bottom="-20" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false"
-			     label="Ban these avatars: ([LISTED] listed, [MAX] max)" left="4" mouse_opaque="true"
-			     name="LandBanCheck" radio_style="false" width="278" />
-			<name_list allow_calling_card_drop="false" background_visible="true" bottom="-200"
-			     column_padding="0" draw_border="true" draw_heading="true" heading_font="SansSerifSmall" heading_height="14"
-			     enabled="true" follows="left|top|right|bottom" height="170"
-			     hidden="false" left="28" mouse_opaque="true" multi_select="false"
-			     name="LandBanList" width="400">
-				 <column label="Banned Residents" name="name" relwidth="1.0" />
-			</name_list>
-			<button bottom="-230" enabled="true" follows="left|bottom" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Add..."
-			     label_selected="Add..." left="28" mouse_opaque="true" name="Add..."
-			     scale_image="true" width="88" />
-			<button bottom="-230" enabled="false" follows="left|bottom" font="SansSerifSmall"
-			     halign="center" height="16" hidden="false" label="Remove"
-			     label_selected="Remove" left="124" mouse_opaque="true" name="Remove"
-			     scale_image="true" width="88" />
-			<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|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="4" mouse_opaque="true" name="Deny by Payment Status:" v_pad="0"
-			     width="278">
-				Deny by Payment Status:
-			</text>
-			<check_box bottom="-280" enabled="true" follows="left|bottom" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false"
-			     label="Deny No Payment Info On File" left="28" mouse_opaque="true"
-			     name="DenyAnonymousCheck" radio_style="false" width="254" />
-			<check_box bottom="-300" enabled="true" follows="left|bottom" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false"
-			     label="Deny Payment Info On File" left="28" mouse_opaque="true"
-			     name="DenyIdentifiedCheck" radio_style="false" width="254" />
-			<check_box bottom="-320" enabled="true" follows="left|bottom" font="SansSerifSmall"
-			     height="16" hidden="false" initial_value="false"
-			     label="Deny Payment Info Used" left="28" mouse_opaque="true"
-			     name="DenyTransactedCheck" radio_style="false" width="254" />
 		</panel>
- -->
 	</tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
index 259cb3d..69543b0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
@@ -1,70 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
-	name="active_speakers"
-	title="Active Speakers"
-	width="250"
-	height="300"
-	rect_control="FloaterActiveSpeakersRect"
-	can_resize="true"
-	can_minimize="true"
-	can_close="true"
-	can_drag_on_left="false"
-	min_width="180"
-	min_height="200"
-	>
-	<panel name="active_speakers_panel" left="0" bottom="0" right="250" top="300" follows="left|top|right|bottom" mouse_opaque="false">
-		<scroll_list
-		name="speakers_list"
-			left="10"
-			right="-10"
-			top="-20"
-			bottom="35"
-			column_padding="0"
-			can_resize="true"
-			follows="left|top|bottom|right"
-			draw_heading="true"
-			draw_stripes="false"
-			multi_select="false"
-			search_column="1"
-      sort_column="2"
-		>
-	   		<column name="icon_speaking_status" width="20" sort="speaking_status"/>	
-			<column name="speaker_name" label="Name" dynamicwidth="true" />
-			<column name="speaking_status" label="" width="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="300" min_height="200" min_width="180" name="active_speakers"
+     rect_control="FloaterActiveSpeakersRect" title="Active Speakers"
+     width="250">
+	<panel bottom="0" follows="left|top|right|bottom" left="0" mouse_opaque="false"
+	     name="active_speakers_panel" right="250" top="300">
+		<scroll_list bottom="35" can_resize="true" column_padding="0" draw_heading="true"
+		     draw_stripes="false" follows="left|top|bottom|right" left="10"
+		     multi_select="false" name="speakers_list" right="-10" search_column="1"
+		     sort_column="2" top="-20">
+			<column name="icon_speaking_status" sort="speaking_status" width="20" />
+			<column dynamicwidth="true" label="Name" name="speaker_name" />
+			<column label="" name="speaking_status" width="0" />
 		</scroll_list>
-		<panel 
-			name="volume_container"
-			left="10"
-			right="-10"	
-			height="20"
-			bottom="5"	
-			border="false"
-			mouse_opaque="true"
-			bevel_style="in"
-			background_visible="false"
-			background_opaque="false"
-			follows="left|right|bottom"
-			bg_opaque_color="0,0,0,0.3"
-			bg_alpha_color="0,0,0,0"
-			can_resize="false"
-			>
-			<volume_slider
-				name="speaker_volume"
-				left_delta="10"
-				width="110"
-				bottom="5"
-				height="15"
-				follows="left|bottom"
-				min_val="0.0"
-				max_val="1.0"
-				increment="0.05"
-				initial_val="0.5"
-			/>
-			<button bottom_delta="0" height="20"
-				image_selected="icn_speaker-muted_dark.tga"
-				image_unselected="icn_speaker_dark.tga" label="" left_delta="115"
-				name="mute_btn" toggle="true" width="25" tool_tip="Mute voice for this resident"/>
-
-		</panel>		
+		<panel background_opaque="false" background_visible="false" bevel_style="in"
+		     bg_alpha_color="0,0,0,0" bg_opaque_color="0,0,0,0.3" border="false"
+		     bottom="5" can_resize="false" follows="left|right|bottom" height="20"
+		     left="10" mouse_opaque="true" name="volume_container" right="-10">
+			<volume_slider bottom="5" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
+			     left_delta="10" max_val="1.0" min_val="0.0" name="speaker_volume"
+			     width="110" />
+			<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
+			     image_unselected="icn_speaker_dark.tga" label="" left_delta="115"
+			     name="mute_btn" toggle="true" tool_tip="Mute voice for this resident"
+			     width="25" />
+		</panel>
 	</panel>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_animation_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_animation_preview.xml
index d766a33..f925abd 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_animation_preview.xml
@@ -15,8 +15,9 @@
 	<line_editor bottom_delta="-2" follows="top|left|right" height="19" left="85"
 	     max_length="254" name="description_form" right="-10" />
 	<pad height="0" />
-	<spinner decimal_digits="0" follows="left|top" height="18" increment="1" initial_val="0" 
-		 label="Priority" label_width="50" left="10" max_val="4" min_val="0" name="priority"
+	<spinner decimal_digits="0" follows="left|top" height="18" increment="1" initial_val="0"
+	     label="Priority" label_width="50" left="10" max_val="4" min_val="0"
+	     name="priority"
 	     tool_tip="Controls which other animations can be overridden by this animation."
 	     width="90" />
 	<check_box bottom_delta="-23" follows="left|top" height="18" label="Loop" left="10"
@@ -31,9 +32,9 @@
 	<text bottom_delta="-20" follows="top|left" height="15" left="10" name="hand_label">
 		Hand Pose
 	</text>
-	<combo_box bottom_delta="-2" follows="left|top" height="18" label="" left_delta="76" width="104"
+	<combo_box bottom_delta="-2" follows="left|top" height="18" label="" left_delta="76"
 	     name="hand_pose_combo" right="190"
-	     tool_tip="Controls what hands do during animation.">
+	     tool_tip="Controls what hands do during animation." width="104">
 		<combo_item name="Spread" value="">
 			Spread
 		</combo_item>
@@ -77,9 +78,9 @@
 	<text bottom_delta="-22" follows="top|left" height="15" left="10" name="emote_label">
 		Expression
 	</text>
-	<combo_box bottom_delta="-2" follows="left|top" height="18" label="" left_delta="76" width="104"
+	<combo_box bottom_delta="-2" follows="left|top" height="18" label="" left_delta="76"
 	     name="emote_combo" right="190"
-	     tool_tip="Controls what face does during animation.">
+	     tool_tip="Controls what face does during animation." width="104">
 		<combo_item name="[None]">
 			[None]
 		</combo_item>
@@ -141,12 +142,14 @@
 			Worry
 		</combo_item>
 	</combo_box>
-        	<text bottom_delta="-21" follows="top|left" height="15" left="10" name="preview_label" width="70">
+	<text bottom_delta="-21" follows="top|left" height="15" left="10"
+	     name="preview_label" width="70">
 		Preview while
 	</text>
-        <!-- <combo_box bottom_delta="-2" follows="left|top" height="18" label="" left="185" -->
-	<combo_box bottom_delta="-2" follows="left|top" height="18" label="" left_delta="76" name="preview_base_anim" width="104"
-	     tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
+	<combo_box bottom_delta="-2" follows="left|top" height="18" label="" left_delta="76"
+	     name="preview_base_anim"
+	     tool_tip="Use this to test your animation behavior while your avatar performs common actions."
+	     width="104">
 		<combo_item name="Standing">
 			Standing
 		</combo_item>
@@ -160,7 +163,6 @@
 			Flying
 		</combo_item>
 	</combo_box>
-
 	<spinner bottom_delta="-25" follows="left|top" height="18" increment="0.01"
 	     initial_val="0" label="Ease In (sec)" label_width="65" left="10"
 	     max_val="10" min_val="0" name="ease_in_time"
@@ -171,32 +173,33 @@
 	     max_val="10" min_val="0" name="ease_out_time"
 	     tool_tip="Amount of time (in seconds) over which animations blends out."
 	     width="135" />
-	<button bottom_delta="-42" follows="top|right" height="28" label="" left="10" name="play_btn"
-	     tool_tip="Play/pause your animation." width="28" />
+	<button bottom_delta="-42" follows="top|right" height="28" label="" left="10"
+	     name="play_btn" tool_tip="Play/pause your animation." width="28" />
 	<button bottom_delta="0" follows="top|right" height="28" label="" left_delta="32"
 	     name="stop_btn" tool_tip="Stop animation playback" width="28" />
-	<slider bottom_delta="0" follows="top|right" height="20" increment="0.0001" initial_val="0"
-	     label="" label_width="0" left="80" max_val="1" min_val="0"
+	<slider bottom_delta="0" follows="top|right" height="20" increment="0.0001"
+	     initial_val="0" label="" label_width="0" left="80" max_val="1" min_val="0"
 	     name="playback_slider" right="290" show_text="false" />
 	<text bottom="250" follows="top|left" left="10" name="bad_animation_text">
 		Unable to read animation file.
 	
 	We recommend BVH files exported from Poser 4.
 	</text>
-	<button bottom="10" follows="bottom|right" height="20" label="Cancel" right="290"
-	     name="cancel_btn" width="123" />
+	<button bottom="10" follows="bottom|right" height="20" label="Cancel" name="cancel_btn"
+	     right="290" width="123" />
 	<button bottom="10" follows="bottom|left" height="20" label="Upload (L$[AMOUNT])"
 	     left_delta="-129" name="ok_btn" width="123" />
-
-	<text hidden="true" name="failed_to_initialize">Failed to initialize motion</text>
-	<text hidden="true" name="anim_too_long">
-Animation file is [LENGTH] seconds in length.
+	<string name="failed_to_initialize">
+		Failed to initialize motion
+	</string>
+	<string name="anim_too_long">
+		Animation file is [LENGTH] seconds in length.
 
 Maximum animation length is [MAX_LENGTH] seconds.
-	</text>
-	<text hidden="true" name="failed_file_read">
-Unable to read animation file.
+	</string>
+	<string name="failed_file_read">
+		Unable to read animation file.
 
 [STATUS]
-	</text>
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_auction.xml b/linden/indra/newview/skins/xui/en-us/floater_auction.xml
index 6847d16..4e09f29 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_auction.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_auction.xml
@@ -17,7 +17,7 @@
 	<button bottom="-360" follows="left|bottom" font="SansSerif" halign="center"
 	     height="20" label="OK" label_selected="OK" left_delta="100"
 	     mouse_opaque="true" name="ok_btn" width="48" />
-	<text hidden="true" name="already for sale">
+	<string name="already for sale">
 		You cannot auction parcels which are already for sale.
-	</text>
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml b/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
index ab0c0ad..41dc3eb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="40" left="40" height="200" width="180" 
-	 rect_control="FloaterAudioVolumeRect"
-	 can_resize="false" can_close="true" can_drag_on_left="false" can_minimize="false"
-	 name="Volume" title="Volume">
-	<panel border="true" bottom="-210" enabled="true" follows="left|top|right|bottom"
-	       hidden="false" label="Volume" left="5" height="180" width="175"
-	       mouse_opaque="true" name="Volume Panel"
-	       filename="panel_audio.xml">
-	</panel>
+<floater bottom="40" can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="200" left="40" name="Volume"
+     rect_control="FloaterAudioVolumeRect" title="Volume" width="250">
+	<panel border="true" bottom="-210" enabled="true" filename="panel_audio.xml"
+	     follows="left|top|right|bottom" height="180" label="Volume" left="5"
+	     mouse_opaque="true" name="Volume Panel" width="175" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml b/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml
index b823b78..8e3f822 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml
@@ -1,45 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-380" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="380" hidden="false" left="400" min_height="340"
-     min_width="200" mouse_opaque="true" name="avatarpicker"
-     title="Choose Resident" width="240">
+     can_resize="true" height="380" left="400" min_height="340" min_width="200"
+     mouse_opaque="true" name="avatarpicker" title="Choose Resident" width="240">
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-40" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="12" mouse_opaque="true" name="instruct_search_resident_name"
-	     v_pad="0" width="220">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="true" name="instruct_search_resident_name" v_pad="0"
+	     width="220">
 		Type part of the resident&apos;s name:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-16"
-	     follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-	     left="12" max_length="254" mouse_opaque="true" name="Edit"
-	     select_on_focus="false" width="132" />
-	<button bottom_delta="-3" follows="top|right" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Find" label_selected="Find" left_delta="140"
+	     follows="left|top|right" font="SansSerifSmall" height="16" left="12"
+	     max_length="254" mouse_opaque="true" name="Edit" select_on_focus="false"
+	     width="132" />
+	<button bottom_delta="-3" follows="top|right" font="SansSerif" halign="center"
+	     height="20" label="Find" label_selected="Find" left_delta="140"
 	     mouse_opaque="true" name="Find" scale_image="TRUE" width="80" />
-	<scroll_list background_visible="true" bottom_delta="-164" column_padding="5" draw_border="true"
-	     draw_heading="false" draw_stripes="true" follows="left|top|right"
-	     height="156" hidden="false" left="12" mouse_opaque="true"
+	<scroll_list background_visible="true" bottom_delta="-164" column_padding="5"
+	     draw_border="true" draw_heading="false" draw_stripes="true"
+	     follows="left|top|right" height="156" left="12" mouse_opaque="true"
 	     multi_select="false" name="Names" width="220" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="12" mouse_opaque="true" name="Or select their calling card:" v_pad="0"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="true" name="Or select their calling card:" v_pad="0"
 	     width="220">
 		Or select a calling card:
 	</text>
 	<inventory_panel allow_multi_select="false" border="true" bottom_delta="-100"
-	     follows="left|top|right|bottom" height="100" hidden="false" left="12"
-	     mouse_opaque="true" name="Inventory Panel"
-	     sort_order="AvatarPickerSortOrder" width="220" />
+	     follows="left|top|right|bottom" height="100" left="12" mouse_opaque="true"
+	     name="Inventory Panel" sort_order="AvatarPickerSortOrder" width="220" />
 	<button bottom_delta="-28" follows="left|bottom" font="SansSerif" halign="center"
-	     height="20" hidden="false" label="Close" label_selected="Close"
-	     right="230" mouse_opaque="true" name="Close" scale_image="TRUE"
-	     width="105" />
+	     height="20" label="Close" label_selected="Close" mouse_opaque="true"
+	     name="Close" right="230" scale_image="TRUE" width="105" />
 	<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-	     height="20" hidden="false" label="Select" label_selected="Select" right="119"
-	     mouse_opaque="true" name="Select" scale_image="TRUE" width="105" />
-	<text hidden="true" name="NotFound">
+	     height="20" label="Select" label_selected="Select" mouse_opaque="true"
+	     name="Select" right="119" scale_image="TRUE" width="105" />
+	<string name="NotFound">
 		&apos;[TEXT]&apos; not found
-	</text>
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml b/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml
index 6442a2c..8ad36af 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml
@@ -14,9 +14,9 @@
 	     name="head_bodypaint" width="128" />
 	<texture_picker bottom_delta="0" height="143" label="Hair" left_delta="270" name="hair"
 	     width="128" />
-	<button bottom_delta="0" font="SansSerif" halign="center" height="20" hidden="false"
-	     label="Dump" label_selected="Dump" left_delta="125" mouse_opaque="true"
-	     name="Dump" scale_image="TRUE" width="80" />
+	<button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Dump"
+	     label_selected="Dump" left_delta="125" mouse_opaque="true" name="Dump"
+	     scale_image="TRUE" width="80" />
 	<texture_picker bottom_delta="-150" height="143" label="Eyes" left="10" name="baked_eyes"
 	     width="128" />
 	<texture_picker bottom_delta="0" height="143" label="Eye" left_delta="135" name="eye_texture"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_bumps.xml b/linden/indra/newview/skins/xui/en-us/floater_bumps.xml
index cefa7a5..a704fe0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_bumps.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_bumps.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-572" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="180" hidden="false" left="0"
-     min_height="100" min_width="100" mouse_opaque="true" name="floater_bumps"
+     can_resize="false" enabled="true" height="180" left="0" min_height="100"
+     min_width="100" mouse_opaque="true" name="floater_bumps"
      rect_control="FloaterBumpRect" title="Bumps, Pushes &amp; Hits" width="400">
 	<scroll_list background_visible="true" bottom="-172" column_padding="5" draw_border="false"
 	     draw_heading="false" draw_stripes="true" enabled="true"
-	     follows="left|top|right|bottom" height="152" hidden="false" left="6"
-	     mouse_opaque="true" multi_select="true" name="bump_list" width="388" />
-	<text hidden="true" name="none_detected">
+	     follows="left|top|right|bottom" height="152" left="6" mouse_opaque="true"
+	     multi_select="true" name="bump_list" width="388" />
+	<string name="none_detected">
 		None detected
-	</text>
-	<text hidden="true" name="bump">
+	</string>
+	<string name="bump">
 		[TIME]  [FIRST] [LAST] bumped you
-	</text>
-	<text hidden="true" name="llpushobject">
+	</string>
+	<string name="llpushobject">
 		[TIME]  [FIRST] [LAST] pushed you with a script
-	</text>
-	<text hidden="true" name="selected_object_collide">
+	</string>
+	<string name="selected_object_collide">
 		[TIME]  [FIRST] [LAST] hit you with an object
-	</text>
-	<text hidden="true" name="scripted_object_collide">
+	</string>
+	<string name="scripted_object_collide">
 		[TIME]  [FIRST] [LAST] hit you with a scripted object
-	</text>
-	<text hidden="true" name="physical_object_collide">
+	</string>
+	<string name="physical_object_collide">
 		[TIME]  [FIRST] [LAST] hit you with a physical object
-	</text>
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
index d4a01f9..929df7d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
@@ -31,7 +31,13 @@
 	<check_box bottom="-244" follows="left|bottom" font="SansSerifSmall" height="20"
 	     initial_value="false" label="Wear clothing now" left_delta="-139"
 	     mouse_opaque="true" name="wear_check" width="135" />
-	<text hidden="true" name="no_copy_text"> (no copy)</text>
-	<text hidden="true" name="no_modify_text"> (no modify)</text>
-	<text hidden="true" name="no_transfer_text"> (no transfer)</text>
+	<string name="no_copy_text">
+		(no copy)
+	</string>
+	<string name="no_modify_text">
+		(no modify)
+	</string>
+	<string name="no_transfer_text">
+		(no transfer)
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml
index de324b3..d5c4c96 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml
@@ -82,13 +82,11 @@ You&apos;ll need to try the operation again.
 		You aren&apos;t buying enough currency
 Increase the amount to buy.
 	</text>
-        <button bottom_delta="-40" follows="bottom|right" height="20" label="Cancel" left="237"
+	<button bottom_delta="-40" follows="bottom|right" height="20" label="Cancel" left="237"
 	     name="cancel_btn" width="90" />
-        <button bottom_delta="0" follows="bottom|left" height="20" label="Purchase" left_delta="-96"
-	     name="buy_btn" width="90" />
-	<!--button bottom_delta="-28" follows="bottom|left" height="20" label="Purchase" left="237"
-	     name="buy_btn" width="90" />
-	<button bottom_delta="-22" follows="bottom|right" height="20" label="Cancel" left="237"
-	     name="cancel_btn" width="90" /-->
-	<text hidden="true" name="buy_currency">Buy L$ [LINDENS] for approx. US$ [USD]</text>
+	<button bottom_delta="0" follows="bottom|left" height="20" label="Purchase"
+	     left_delta="-96" name="buy_btn" width="90" />
+	<string name="buy_currency">
+		Buy L$ [LINDENS] for approx. US$ [USD]
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
index bd12460..cadcf31 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
@@ -68,28 +68,27 @@
 	     name="info_parcel_label" text_color="white" width="48">
 		Parcel:
 	</text>
-	<text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left_delta="50"
-	     name="info_parcel" right="400" text_color="white">
+	<text bottom_delta="-5" follows="top|left" font="SansSerif" height="16"
+	     left_delta="50" name="info_parcel" right="400" text_color="white">
 		Scotopteryx 138,204
 	</text>
 	<text follows="top|left" font="SansSerifSmall" left="204" name="info_size_label"
 	     text_color="white" width="48">
 		Size:
 	</text>
-	<text bottom_delta="-21" follows="top|left" font="SansSerif" height="32" left_delta="50"
-	     name="info_size" right="400" text_color="white">
+	<text bottom_delta="-21" follows="top|left" font="SansSerif" height="32"
+	     left_delta="50" name="info_size" right="400" text_color="white">
 		1024 sq. m.
 	</text>
 	<text follows="top|left" font="SansSerifSmall" left="204" name="info_price_label"
 	     text_color="white" width="48">
 		Price:
 	</text>
-	<text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left_delta="50"
-	     name="info_price" right="400" text_color="white">
+	<text bottom_delta="-5" follows="top|left" font="SansSerif" height="16"
+	     left_delta="50" name="info_price" right="400" text_color="white">
 		L$ 1500, objects included
 	</text>
-
-	<text follows="top|left" font="SansSerifHuge" bottom="-180" height="24" left="16"
+	<text bottom="-180" follows="top|left" font="SansSerifHuge" height="24" left="16"
 	     name="info_action" text_color="white" width="200">
 		Buying this land will:
 	</text>
@@ -168,133 +167,135 @@ This parcel is 512 square meters of land.
 	     name="remove_contribution" visible="false" width="275" />
 	<button bottom_delta="-15" follows="bottom|left" height="20" label="Purchase" left="70"
 	     name="buy_btn" width="100" />
-
 	<button bottom="10" follows="bottom|right" height="20" label="Cancel" left="-90"
 	     name="cancel_btn" width="80" />
-	<text hidden="true" name="can_resell">
+	<string name="can_resell">
 		May be resold.
-	</text>
-	<text hidden="true" name="can_not_resell">
+	</string>
+	<string name="can_not_resell">
 		May not be resold.
-	</text>
-	<text hidden="true" name="can_change">
+	</string>
+	<string name="can_change">
 		May be joined or subdivided.
-	</text>
-	<text hidden="true" name="can_not_change">
+	</string>
+	<string name="can_not_change">
 		May not be joined or subdivided.
-	</text>
-	<text hidden="true" name="cant_buy_for_group">
+	</string>
+	<string name="cant_buy_for_group">
 		You do not have permission to buy land for your active group.
-	</text>
-	<text hidden="true" name="no_land_selected">
+	</string>
+	<string name="no_land_selected">
 		No land selected.
-	</text>
-	<text hidden="true" name="multiple_parcels_selected">
+	</string>
+	<string name="multiple_parcels_selected">
 		Multiple different parcels selected.
 Try selecting a smaller area.
-	</text>
-	<text hidden="true" name="no_permission">
+	</string>
+	<string name="no_permission">
 		You do not have permission to buy land for your active group.
-	</text>
-	<text hidden="true" name="parcel_not_for_sale">
+	</string>
+	<string name="parcel_not_for_sale">
 		The selected parcel is not for sale.
-	</text>
-	<text hidden="true" name="group_already_owns">
+	</string>
+	<string name="group_already_owns">
 		The group already owns the parcel.
-	</text>
-	<text hidden="true" name="you_already_own">
+	</string>
+	<string name="you_already_own">
 		You already own the parcel.
-	</text>
-	<text hidden="true" name="set_to_sell_to_other">
+	</string>
+	<string name="set_to_sell_to_other">
 		The selected parcel is set to sell to another party.
-	</text>
-	<text hidden="true" name="no_public_land">
+	</string>
+	<string name="no_public_land">
 		The selected area has no public land.
-	</text>
-	<text hidden="true" name="not_owned_by_you">
+	</string>
+	<string name="not_owned_by_you">
 		Land owned by another user is selected.
 Try selecting a smaller area.
-	</text>
-	<text hidden="true" name="for_first_time_group">
+	</string>
+	<string name="for_first_time_group">
 		This land is reserved for first time buyers.
 You cannot buy it for a group.
-	</text>
-	<text hidden="true" name="for_first_time">
+	</string>
+	<string name="for_first_time">
 		This land is reserved for first time buyers.
 You already own land.
-	</text>
-	<text hidden="true" name="processing">
+	</string>
+	<string name="processing">
 		Processing your purchase...
  
 (This may take a minute or two.)
-	</text>
-	<text hidden="true" name="fetching_error">
+	</string>
+	<string name="fetching_error">
 		There has been an error while fetching land buying information.
-	</text>
-	<text hidden="true" name="buying_will">
+	</string>
+	<string name="buying_will">
 		Buying this land will:
-	</text>
-	<text hidden="true" name="buying_for_group">
+	</string>
+	<string name="buying_for_group">
 		Buying land for group:
-	</text>
-	<text hidden="true" name="cannot_buy_now">
+	</string>
+	<string name="cannot_buy_now">
 		Cannot buy now:
-	</text>
-	<text hidden="true" name="not_for_sale">
+	</string>
+	<string name="not_for_sale">
 		Not for sale:
-	</text>
-	<text hidden="true" name="none_needed">
+	</string>
+	<string name="none_needed">
 		none needed
-	</text>
-	<text hidden="true" name="must_upgrade">
+	</string>
+	<string name="must_upgrade">
 		Your account must be upgraded to own land.
-	</text>
-	<text hidden="true" name="cant_own_land">
+	</string>
+	<string name="cant_own_land">
 		Your account can own land.
-	</text>
-
-	<text hidden="true" name="land_holdings">
+	</string>
+	<string name="land_holdings">
 		You hold [BUYER] square meters of land.
-	</text>
-	<text hidden="true" name="pay_to_for_land">
+	</string>
+	<string name="pay_to_for_land">
 		Pay L$ [AMOUNT] to [SELLER] for this land
-	</text>
-	<text hidden="true" name="buy_for_US">
+	</string>
+	<string name="buy_for_US">
 		Buy L$ [AMOUNT] for approx. US$ [AMOUNT2] ,
-	</text>
-	<text hidden="true" name="parcel_meters">
+	</string>
+	<string name="parcel_meters">
 		This parcel is [AMOUNT] square meters.
-	</text>
-	<text hidden="true" name="premium_land">
+	</string>
+	<string name="premium_land">
 		This land is premium, and will charge as [AMOUNT] square meters.
-	</text>
-	<text hidden="true" name="discounted_land">
+	</string>
+	<string name="discounted_land">
 		This land is discounted, and will charge as [AMOUNT] square meters.
-	</text>
-	<text hidden="true" name="meters_supports_object">
+	</string>
+	<string name="meters_supports_object">
 		[AMOUNT] sq. meters
 supports [AMOUNT2] objects
-	</text>
-	<text hidden="true" name="sold_with_objects">
+	</string>
+	<string name="sold_with_objects">
 		sold with objects
-	</text>
-	<text hidden="true" name="insufficient_land_credits">
+	</string>
+	<string name="insufficient_land_credits">
 		The group [GROUP] will need sufficient contributed land use 
 credits to cover this parcel before the purchase will 
 complete.
-	</text>
-	<text hidden="true" name="have_enough_lindens">
+	</string>
+	<string name="have_enough_lindens">
 		You have L$ [AMOUNT], which is enough to buy this land.
-	</text>
-	<text hidden="true" name="not_enough_lindens">
+	</string>
+	<string name="not_enough_lindens">
 		You have only L$ [AMOUNT], and need L$ [AMOUNT2] more.
-	</text>
-	<text hidden="true" name="balance_left">
+	</string>
+	<string name="balance_left">
 		After the purchase, you will have L$ [AMOUNT] left.
-	</text>
-	<text hidden="true" name="balance_needed">
+	</string>
+	<string name="balance_needed">
 		You need to buy at least L$ [AMOUNT] to afford this land.
-	</text>
-	<text hidden="true" name="no_parcel_selected">(no parcel selected)</text>
-	<text hidden="true" name="buy_currency">Buy L$ [LINDENS] for approx. US$ [USD]</text>
+	</string>
+	<string name="no_parcel_selected">
+		(no parcel selected)
+	</string>
+	<string name="buy_currency">
+		Buy L$ [LINDENS] for approx. US$ [USD]
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml
index 4b2ec26..1c0f9fb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml
@@ -36,8 +36,19 @@
 	<button bottom="-244" follows="right|bottom" font="SansSerif" halign="center"
 	     height="20" label="Buy" label_selected="Buy" left_delta="-64"
 	     mouse_opaque="true" name="buy_btn" width="60" />
-	<text hidden="true" name="title_buy_text">Buy [NAME]</text>
-	<text hidden="true" name="no_copy_text"> (no copy)</text>
-	<text hidden="true" name="no_modify_text"> (no modify)</text>
-	<text hidden="true" name="no_transfer_text"> (no transfer)</text>
+	<string name="title_buy_text">
+		Buy
+	</string>
+	<string name="title_buy_copy_text">
+		Buy a copy of
+	</string>
+	<string name="no_copy_text">
+		(no copy)
+	</string>
+	<string name="no_modify_text">
+		(no modify)
+	</string>
+	<string name="no_transfer_text">
+		(no transfer)
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
index ce87e38..49bdde9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
@@ -1,67 +1,73 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="true" can_tear_off="true" enabled="true" height="270"
-     hidden="false" left="15" min_height="150" min_width="425"
-     mouse_opaque="true" name="chat floater" rect_control="FloaterChatRect"
-     title="Local Chat" width="435">
-
-	<string name="ringing">Connecting to in-world Voice Chat...</string>
-	<string name="connected">Connected</string>
-	<string name="unavailable">Voice not available at your current location</string>
-	<string name="hang_up">Disconnected from in-world Voice Chat</string>
-	<string name="voice_icon">icn_voice-localchat.tga</string>
-     
-    <layout_stack border="false" left="2" bottom="2" width="430" height="250" follows="left|top|right|bottom" orientation="horizontal">
-    	<layout_panel border="false" name="im_contents_panel" min_width="275" left="0" bottom="0" width="305" height="130" default_tab_group="1">
-    		 
-    		<combo_box left="4"
-    				height="20" 
-    				width="120"
-    				label="Gestures" 
-    				follows="left|top" 
-    				name="Gesture">
- 				<combo_item name="Gestures">
+     can_resize="true" can_tear_off="true" enabled="true" height="270" left="15"
+     min_height="150" min_width="425" mouse_opaque="true" name="chat floater"
+     rect_control="FloaterChatRect" title="Local Chat (history)" width="435">
+	<string name="ringing">
+		Connecting to in-world Voice Chat...
+	</string>
+	<string name="connected">
+		Connected
+	</string>
+	<string name="unavailable">
+		Voice not available at your current location
+	</string>
+	<string name="hang_up">
+		Disconnected from in-world Voice Chat
+	</string>
+	<string name="voice_icon">
+		icn_voice-localchat.tga
+	</string>
+	<layout_stack border="false" bottom="2" follows="left|top|right|bottom" height="250" left="2"
+	     orientation="horizontal" width="430">
+		<layout_panel border="false" bottom="0" default_tab_group="1" height="130" left="0"
+		     min_width="275" name="im_contents_panel" width="305">
+			<combo_box follows="left|top" height="20" label="Gestures" left="4" name="Gesture"
+			     width="120">
+				<combo_item name="Gestures">
 					Gestures
 				</combo_item>
 			</combo_box>
-
-  			<check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-					height="20" initial_value="false" label="Show Muted Text"
-					left_delta="125" name="show mutes" radio_style="false"
-					width="116" />
-
-    		<button left="270" right="303" bottom_delta="0" height="20" width="70" label="&lt; &lt;" label_selected="&gt; &gt;" follows="right|top" name="toggle_active_speakers_btn" visible="true" tool_tip="Click here to show list of active partipants in this IM session."/>
-
+			<check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
+			     height="20" initial_value="false" label="Show Muted Text" left_delta="125"
+			     name="show mutes" radio_style="false" width="116" />
+			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
+			     label_selected="&gt; &gt;" left="270" name="toggle_active_speakers_btn"
+			     right="303"
+			     tool_tip="Click here to show list of active participants in this IM session."
+			     visible="true" width="70" />
 			<text_editor type="string" length="1" bottom="28" embedded_items="false" enabled="false"
-				follows="left|top|right|bottom" font="SansSerif" height="70"
-				hidden="false" left="6" max_length="2147483647" mouse_opaque="true"
-				name="Chat History Editor" text_color="1 1 1 1"
-				text_readonly_color="1 1 1 1" width="300" word_wrap="true" />
+			     follows="left|top|right|bottom" font="SansSerif" height="70" left="6"
+			     max_length="2147483647" mouse_opaque="true" name="Chat History Editor"
+			     text_color="1 1 1 1" text_readonly_color="1 1 1 1" width="300"
+			     word_wrap="true" />
 			<text_editor type="string" length="1" bottom="28" embedded_items="false" enabled="false"
-				follows="left|top|right|bottom" font="SansSerif" height="70"
-				hidden="false" left="6" max_length="2147483647" mouse_opaque="true"
-				name="Chat History Editor with mute" text_color="1 1 1 1"
-				text_readonly_color="1 1 1 1" width="300" word_wrap="true" />
-    		
-   			<panel name="chat_panel" bottom="3" left="5" right="-5" top="25" tab_group="1" follows="left|right|bottom">
+			     follows="left|top|right|bottom" font="SansSerif" height="70" left="6"
+			     max_length="2147483647" mouse_opaque="true"
+			     name="Chat History Editor with mute" text_color="1 1 1 1"
+			     text_readonly_color="1 1 1 1" width="300" word_wrap="true" />
+			<panel bottom="3" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
+			     tab_group="1" top="25">
 				<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
-					enabled="true" follows="left|right|bottom" font="SansSerif"
-					handle_edit_keys_directly="false" height="20" hidden="false"
-					label="Click here to chat." left="0" right="-90" max_length="254"
-					mouse_opaque="true" name="Chat Editor" select_all_on_focus_received="false"
-					select_on_focus="false" tab_group="1"/>
+				     enabled="true" follows="left|right|bottom" font="SansSerif"
+				     handle_edit_keys_directly="false" height="20" label="Click here to chat."
+				     left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
+				     right="-90" select_all_on_focus_received="false" select_on_focus="false"
+				     tab_group="1" />
 				<flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-80"
-					mouse_opaque="true" name="Say" tool_tip="(Enter)" width="70" list_position="above">
-					<flyout_button_item value="shout">Shout</flyout_button_item>
-					<flyout_button_item value="say">Say</flyout_button_item>
+				     list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
+				     width="70">
+					<flyout_button_item value="shout">
+						Shout
+					</flyout_button_item>
+					<flyout_button_item value="say">
+						Say
+					</flyout_button_item>
 				</flyout_button>
 			</panel>
-   		
-    	</layout_panel>
-
-		<layout_panel filename="panel_speaker_controls.xml" auto_resize="false" bottom="0" can_resize="true" height="120" left="0"
-		     min_width="140" name="active_speakers_panel" top_delta="0" visible="false"
-		     width="140"/>
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" can_resize="true"
+		     filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"
+		     name="active_speakers_panel" top_delta="0" visible="false" width="140" />
 	</layout_stack>
-
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml b/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
index 807d833..b836893 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
      height="390" min_height="340" min_width="400" name="floater_chatterbox"
-     title="Communicate" width="392" rect_control="ChatterboxRect">
+     rect_control="ChatterboxRect" title="Communicate" width="392">
 	<tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
 	     name="chatterbox_tabs" tab_position="bottom" tab_width="80" width="395" />
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_color_picker.xml b/linden/indra/newview/skins/xui/en-us/floater_color_picker.xml
index adb7821..dc40144 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_color_picker.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_color_picker.xml
@@ -66,7 +66,7 @@
 	<button bottom="-373" follows="right|bottom" font="SansSerif" halign="center"
 	     height="20" label="Cancel" label_selected="Cancel" left_delta="75"
 	     mouse_opaque="true" name="cancel_btn" width="100" />
-        <button bottom="-373" follows="right|bottom" font="SansSerif" halign="center"
+	<button bottom="-373" follows="right|bottom" font="SansSerif" halign="center"
 	     height="20" label="Select" label_selected="Select" left_delta="104"
 	     mouse_opaque="true" name="select_btn" width="100" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_critical.xml b/linden/indra/newview/skins/xui/en-us/floater_critical.xml
index 367e10c..58c8c16 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_critical.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="false" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="500" min_height="100" min_width="100"
-     name="modal container" title=" " width="600">
+     name="modal container" title="" width="600">
 	<button bottom="-484" font="SansSerif" halign="center" height="20" label="Continue"
 	     label_selected="Continue" left="376" mouse_opaque="true" name="Continue"
 	     width="100" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/xui/en-us/floater_customize.xml
index 5fdba23..1123355 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_customize.xml
@@ -1,1113 +1,1070 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-562" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" follows="left|top" height="540" hidden="false" left="12"
-     min_height="0" min_width="0" mouse_opaque="true" name="floater customize"
+     can_resize="false" follows="left|top" height="540" left="12" min_height="0"
+     min_width="0" mouse_opaque="true" name="floater customize"
      rect_control="FloaterCustomizeAppearanceRect" title="Appearance"
      width="494">
-	<tab_container bottom="-507" height="483" hidden="false" left="0" mouse_opaque="false"
-	     name="customize tab container" tab_position="left" width="492">
+	<tab_container bottom="-507" height="483" left="0" mouse_opaque="false"
+	     name="customize tab container" tab_min_width="96" tab_position="left"
+	     width="492">
 		<panel label="Body Parts" placeholder="true" />
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Shape" left="102" mouse_opaque="true" name="Shape"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Shape" left="102" mouse_opaque="true" name="Shape" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 			<button bottom="-81" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Body" label_selected="Body" left="8"
-			     mouse_opaque="true" name="Body" scale_image="true" width="82" />
+			     height="16" label="Body" label_selected="Body" left="8" mouse_opaque="true"
+			     name="Body" scale_image="true" width="82" />
 			<button bottom="-113" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Head" label_selected="Head" left="8"
-			     mouse_opaque="true" name="Head" scale_image="true" width="82" />
+			     height="16" label="Head" label_selected="Head" left="8" mouse_opaque="true"
+			     name="Head" scale_image="true" width="82" />
 			<button bottom="-145" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Eyes" label_selected="Eyes" left="8"
-			     mouse_opaque="true" name="Eyes" scale_image="true" width="82" />
+			     height="16" label="Eyes" label_selected="Eyes" left="8" mouse_opaque="true"
+			     name="Eyes" scale_image="true" width="82" />
 			<button bottom="-177" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Ears" label_selected="Ears" left="8"
-			     mouse_opaque="true" name="Ears" scale_image="true" width="82" />
+			     height="16" label="Ears" label_selected="Ears" left="8" mouse_opaque="true"
+			     name="Ears" scale_image="true" width="82" />
 			<button bottom="-209" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Nose" label_selected="Nose" left="8"
-			     mouse_opaque="true" name="Nose" scale_image="true" width="82" />
+			     height="16" label="Nose" label_selected="Nose" left="8" mouse_opaque="true"
+			     name="Nose" scale_image="true" width="82" />
 			<button bottom="-241" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Mouth" label_selected="Mouth" left="8"
+			     height="16" label="Mouth" label_selected="Mouth" left="8"
 			     mouse_opaque="true" name="Mouth" scale_image="true" width="82" />
 			<button bottom="-273" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Chin" label_selected="Chin" left="8"
-			     mouse_opaque="true" name="Chin" scale_image="true" width="82" />
+			     height="16" label="Chin" label_selected="Chin" left="8" mouse_opaque="true"
+			     name="Chin" scale_image="true" width="82" />
 			<button bottom="-305" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Torso" label_selected="Torso" left="8"
+			     height="16" label="Torso" label_selected="Torso" left="8"
 			     mouse_opaque="true" name="Torso" scale_image="true" width="82" />
 			<button bottom="-337" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Legs" label_selected="Legs" left="8"
-			     mouse_opaque="true" name="Legs" scale_image="true" width="82" />
+			     height="16" label="Legs" label_selected="Legs" left="8" mouse_opaque="true"
+			     name="Legs" scale_image="true" width="82" />
 			<radio_group bottom="-387" control_name="AvatarSex" draw_border="true" follows="left|top"
-			     height="34" hidden="false" left="8" mouse_opaque="true" name="sex radio"
-			     width="82">
-				<radio_item type="string" length="1" bottom="-17" follows="left|top" height="16" hidden="false" left="1"
-				     mouse_opaque="true" name="radio" width="82">
+			     height="34" left="8" mouse_opaque="true" name="sex radio" width="82">
+				<radio_item type="string" length="1" bottom="-17" follows="left|top" height="16" left="1" mouse_opaque="true"
+				     name="radio" width="82">
 					Female
 				</radio_item>
-				<radio_item type="string" length="1" bottom="-33" follows="left|top" height="16" hidden="false" left="1"
-				     mouse_opaque="true" name="radio2" width="82">
+				<radio_item type="string" length="1" bottom="-33" follows="left|top" height="16" left="1" mouse_opaque="true"
+				     name="radio2" width="82">
 					Male
 				</radio_item>
 			</radio_group>
 			<button bottom="-433" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Randomize" label_selected="Randomize"
-			     left="8" mouse_opaque="true" name="Randomize" scale_image="true" width="82" />
+			     height="16" label="Randomize" label_selected="Randomize" left="8"
+			     mouse_opaque="true" name="Randomize" scale_image="true" width="82" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new shape by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Shape" label_selected="Create New Shape" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="120" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Skin" left="102" mouse_opaque="true" name="Skin"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Skin" left="102" mouse_opaque="true" name="Skin" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<button bottom="-81" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Skin Color" label_selected="Skin Color"
-			     left="8" mouse_opaque="true" name="Skin Color" scale_image="true"
-			     width="82" />
+			     height="16" label="Skin Color" label_selected="Skin Color" left="8"
+			     mouse_opaque="true" name="Skin Color" scale_image="true" width="82" />
 			<button bottom="-113" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Face Detail" label_selected="Face Detail"
-			     left="8" mouse_opaque="true" name="Face Detail" scale_image="true"
-			     width="82" />
+			     height="16" label="Face Detail" label_selected="Face Detail" left="8"
+			     mouse_opaque="true" name="Face Detail" scale_image="true" width="82" />
 			<button bottom="-145" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Makeup" label_selected="Makeup" left="8"
+			     height="16" label="Makeup" label_selected="Makeup" left="8"
 			     mouse_opaque="true" name="Makeup" scale_image="true" width="82" />
 			<button bottom="-177" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Body Detail" label_selected="Body Detail"
-			     left="8" mouse_opaque="true" name="Body Detail" scale_image="true"
-			     width="82" />
+			     height="16" label="Body Detail" label_selected="Body Detail" left="8"
+			     mouse_opaque="true" name="Body Detail" scale_image="true" width="82" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new skin by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 			<texture_picker allow_no_texture="true" bottom="-273" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
+			     default_image_name="Default" follows="left|top" height="80"
 			     label="Head Tattoos" left="8" mouse_opaque="true" name="Head Tattoos"
 			     tool_tip="Click to choose a picture" width="74" />
 			<texture_picker allow_no_texture="true" bottom="-353" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
+			     default_image_name="Default" follows="left|top" height="80"
 			     label="Upper Tattoos" left="8" mouse_opaque="true" name="Upper Tattoos"
 			     tool_tip="Click to choose a picture" width="74" />
 			<texture_picker allow_no_texture="true" bottom="-433" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
+			     default_image_name="Default" follows="left|top" height="80"
 			     label="Lower Tattoos" left="8" mouse_opaque="true" name="Lower Tattoos"
 			     tool_tip="Click to choose a picture" width="74" />
 			<button bottom="-449" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Randomize" label_selected="Randomize"
-			     left="8" mouse_opaque="true" name="Randomize" scale_image="true" width="82" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     height="16" label="Randomize" label_selected="Randomize" left="8"
+			     mouse_opaque="true" name="Randomize" scale_image="true" width="82" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Skin" label_selected="Create New Skin" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="120" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Hair" left="102" mouse_opaque="true" name="Hair"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Hair" left="102" mouse_opaque="true" name="Hair" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<button bottom="-81" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Color" label_selected="Color" left="8"
+			     height="16" label="Color" label_selected="Color" left="8"
 			     mouse_opaque="true" name="Color" scale_image="true" width="82" />
 			<button bottom="-113" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Style" label_selected="Style" left="8"
+			     height="16" label="Style" label_selected="Style" left="8"
 			     mouse_opaque="true" name="Style" scale_image="true" width="82" />
 			<button bottom="-145" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Eyebrows" label_selected="Eyebrows"
-			     left="8" mouse_opaque="true" name="Eyebrows" scale_image="true" width="82" />
+			     height="16" label="Eyebrows" label_selected="Eyebrows" left="8"
+			     mouse_opaque="true" name="Eyebrows" scale_image="true" width="82" />
 			<button bottom="-177" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Facial" label_selected="Facial" left="8"
+			     height="16" label="Facial" label_selected="Facial" left="8"
 			     mouse_opaque="true" name="Facial" scale_image="true" width="82" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new hair by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 			<texture_picker allow_no_texture="false" bottom="-273" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Texture" left="8" mouse_opaque="true" name="Texture"
+			     default_image_name="Default" follows="left|top" height="80" label="Texture"
+			     left="8" mouse_opaque="true" name="Texture"
 			     tool_tip="Click to choose a picture" width="64" />
 			<button bottom="-305" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Randomize" label_selected="Randomize"
-			     left="8" mouse_opaque="true" name="Randomize" scale_image="true" width="82" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     height="16" label="Randomize" label_selected="Randomize" left="8"
+			     mouse_opaque="true" name="Randomize" scale_image="true" width="82" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Hair" label_selected="Create New Hair" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="120" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Eyes" left="102" mouse_opaque="true" name="Eyes"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Eyes" left="102" mouse_opaque="true" name="Eyes" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new eyes by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 			<texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Iris" left="8" mouse_opaque="true" name="Iris"
+			     default_image_name="Default" follows="left|top" height="80" label="Iris"
+			     left="8" mouse_opaque="true" name="Iris"
 			     tool_tip="Click to choose a picture" width="64" />
 			<button bottom="-177" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Randomize" label_selected="Randomize"
-			     left="8" mouse_opaque="true" name="Randomize" scale_image="true" width="82" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     height="16" label="Randomize" label_selected="Randomize" left="8"
+			     mouse_opaque="true" name="Randomize" scale_image="true" width="82" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Eyes" label_selected="Create New Eyes" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="120" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 		</panel>
 		<panel label="Clothes" placeholder="true" />
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Shirt" left="102" mouse_opaque="true" name="Shirt"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Shirt" left="102" mouse_opaque="true" name="Shirt" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Fabric" left="8" mouse_opaque="true" name="Fabric"
+			     default_image_name="Default" follows="left|top" height="80" label="Fabric"
+			     left="8" mouse_opaque="true" name="Fabric"
 			     tool_tip="Click to choose a picture" width="64" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-225"
 			     can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
-			     hidden="false" label="Color/Tint" left="8" mouse_opaque="true"
-			     name="Color/Tint" tool_tip="Click to open Color Picker" width="64" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     label="Color/Tint" left="8" mouse_opaque="true" name="Color/Tint"
+			     tool_tip="Click to open Color Picker" width="64" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Shirt" label_selected="Create New Shirt" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="120" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new shirt by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Pants" left="102" mouse_opaque="true" name="Pants"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Pants" left="102" mouse_opaque="true" name="Pants" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Fabric" left="8" mouse_opaque="true" name="Fabric"
+			     default_image_name="Default" follows="left|top" height="80" label="Fabric"
+			     left="8" mouse_opaque="true" name="Fabric"
 			     tool_tip="Click to choose a picture" width="64" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-225"
 			     can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
-			     hidden="false" label="Color/Tint" left="8" mouse_opaque="true"
-			     name="Color/Tint" tool_tip="Click to open Color Picker" width="64" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     label="Color/Tint" left="8" mouse_opaque="true" name="Color/Tint"
+			     tool_tip="Click to open Color Picker" width="64" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Pants" label_selected="Create New Pants" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="120" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new pants by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Shoes" left="102" mouse_opaque="true" name="Shoes"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Shoes" left="102" mouse_opaque="true" name="Shoes" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new shoes by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 			<texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Fabric" left="8" mouse_opaque="true" name="Fabric"
+			     default_image_name="Default" follows="left|top" height="80" label="Fabric"
+			     left="8" mouse_opaque="true" name="Fabric"
 			     tool_tip="Click to choose a picture" width="64" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-225"
 			     can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
-			     hidden="false" label="Color/Tint" left="8" mouse_opaque="true"
-			     name="Color/Tint" tool_tip="Click to open Color Picker" width="64" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     label="Color/Tint" left="8" mouse_opaque="true" name="Color/Tint"
+			     tool_tip="Click to open Color Picker" width="64" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Shoes" label_selected="Create New Shoes" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="120" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Socks" left="102" mouse_opaque="true" name="Socks"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Socks" left="102" mouse_opaque="true" name="Socks" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new socks by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 			<texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Fabric" left="8" mouse_opaque="true" name="Fabric"
+			     default_image_name="Default" follows="left|top" height="80" label="Fabric"
+			     left="8" mouse_opaque="true" name="Fabric"
 			     tool_tip="Click to choose a picture" width="64" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-225"
 			     can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
-			     hidden="false" label="Color/Tint" left="8" mouse_opaque="true"
-			     name="Color/Tint" tool_tip="Click to open Color Picker" width="64" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     label="Color/Tint" left="8" mouse_opaque="true" name="Color/Tint"
+			     tool_tip="Click to open Color Picker" width="64" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Socks" label_selected="Create New Socks" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="120" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Jacket" left="102" mouse_opaque="true" name="Jacket"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Jacket" left="102" mouse_opaque="true" name="Jacket" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new jacket by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 			<texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
+			     default_image_name="Default" follows="left|top" height="80"
 			     label="Upper Fabric" left="8" mouse_opaque="true" name="Upper Fabric"
 			     tool_tip="Click to choose a picture" width="64" />
 			<texture_picker allow_no_texture="false" bottom="-225" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
+			     default_image_name="Default" follows="left|top" height="80"
 			     label="Lower Fabric" left="8" mouse_opaque="true" name="Lower Fabric"
 			     tool_tip="Click to choose a picture" width="64" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-305"
 			     can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
-			     hidden="false" label="Color/Tint" left="8" mouse_opaque="true"
-			     name="Color/Tint" tool_tip="Click to open Color Picker" width="64" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     label="Color/Tint" left="8" mouse_opaque="true" name="Color/Tint"
+			     tool_tip="Click to open Color Picker" width="64" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Jacket" label_selected="Create New Jacket" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="140" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Gloves" left="102" mouse_opaque="true" name="Gloves"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Gloves" left="102" mouse_opaque="true" name="Gloves" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new gloves by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 			<texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Fabric" left="8" mouse_opaque="true" name="Fabric"
+			     default_image_name="Default" follows="left|top" height="80" label="Fabric"
+			     left="8" mouse_opaque="true" name="Fabric"
 			     tool_tip="Click to choose a picture" width="64" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-225"
 			     can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
-			     hidden="false" label="Color/Tint" left="8" mouse_opaque="true"
-			     name="Color/Tint" tool_tip="Click to open Color Picker" width="64" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     label="Color/Tint" left="8" mouse_opaque="true" name="Color/Tint"
+			     tool_tip="Click to open Color Picker" width="64" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Gloves" label_selected="Create New Gloves" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="130" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Undershirt" left="102" mouse_opaque="true"
-		     name="Undershirt" width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Undershirt" left="102" mouse_opaque="true" name="Undershirt"
+		     width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new undershirt by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 			<texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Fabric" left="8" mouse_opaque="true" name="Fabric"
+			     default_image_name="Default" follows="left|top" height="80" label="Fabric"
+			     left="8" mouse_opaque="true" name="Fabric"
 			     tool_tip="Click to choose a picture" width="64" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-225"
 			     can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
-			     hidden="false" label="Color/Tint" left="8" mouse_opaque="true"
-			     name="Color/Tint" tool_tip="Click to open Color Picker" width="64" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     label="Color/Tint" left="8" mouse_opaque="true" name="Color/Tint"
+			     tool_tip="Click to open Color Picker" width="64" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Undershirt" label_selected="Create New Undershirt"
 			     left="8" mouse_opaque="true" name="Create New" scale_image="true"
 			     width="160" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Underpants" left="102" mouse_opaque="true"
-		     name="Underpants" width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Underpants" left="102" mouse_opaque="true" name="Underpants"
+		     width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new underpants by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 			<texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Fabric" left="8" mouse_opaque="true" name="Fabric"
+			     default_image_name="Default" follows="left|top" height="80" label="Fabric"
+			     left="8" mouse_opaque="true" name="Fabric"
 			     tool_tip="Click to choose a picture" width="64" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-225"
 			     can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
-			     hidden="false" label="Color/Tint" left="8" mouse_opaque="true"
-			     name="Color/Tint" tool_tip="Click to open Color Picker" width="64" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     label="Color/Tint" left="8" mouse_opaque="true" name="Color/Tint"
+			     tool_tip="Click to open Color Picker" width="64" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Underpants" label_selected="Create New Underpants"
 			     left="8" mouse_opaque="true" name="Create New" scale_image="true"
 			     width="160" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
-		     hidden="false" label="Skirt" left="102" mouse_opaque="true" name="Skirt"
-		     width="389">
-			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16" hidden="false"
+		     label="Skirt" left="102" mouse_opaque="true" name="Skirt" width="389">
+			<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
 			     image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
 			     width="16" />
-			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" hidden="false"
-			     left="8" mouse_opaque="true" name="icon" width="16" />
+			<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+			     mouse_opaque="true" name="icon" width="16" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title" v_pad="0" width="355">
 				[DESC]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
 				[DESC]: cannot modify
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_loading" v_pad="0" width="355">
 				[DESC]: loading...
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left="26" mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+			     mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
 				[DESC]: not worn
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-			     left="8" mouse_opaque="true" name="path" v_pad="0" width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+			     mouse_opaque="true" name="path" v_pad="0" width="373">
 				Located in [PATH]
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="not worn instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
 				Put on a new skirt by dragging one from your inventory
 to your avatar. Alternately, you create a new one from
 scratch and wear it.
 			</text>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-74" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="28" hidden="false"
-			     left="8" mouse_opaque="true" name="no modify instructions" v_pad="0"
-			     width="373">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+			     mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
 				You do not have permission to modify this wearable.
 			</text>
 			<texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Fabric" left="8" mouse_opaque="true" name="Fabric"
+			     default_image_name="Default" follows="left|top" height="80" label="Fabric"
+			     left="8" mouse_opaque="true" name="Fabric"
 			     tool_tip="Click to choose a picture" width="64" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-225"
 			     can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
-			     hidden="false" label="Color/Tint" left="8" mouse_opaque="true"
-			     name="Color/Tint" tool_tip="Click to open Color Picker" width="64" />
-			<button bottom="-128" follows="left|top" halign="center" height="24" hidden="false"
+			     label="Color/Tint" left="8" mouse_opaque="true" name="Color/Tint"
+			     tool_tip="Click to open Color Picker" width="64" />
+			<button bottom="-128" follows="left|top" halign="center" height="24"
 			     label="Create New Skirt" label_selected="Create New Skirt" left="8"
 			     mouse_opaque="true" name="Create New" scale_image="true" width="120" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Take Off" label_selected="Take Off"
-			     left="35" mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+			     height="20" label="Take Off" label_selected="Take Off" left="35"
+			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save" label_selected="Save" left="123"
+			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Save As" label_selected="Save As"
-			     left="211" mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+			     height="20" label="Save As" label_selected="Save As" left="211"
+			     mouse_opaque="true" name="Save As" scale_image="true" width="82" />
 			<button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" hidden="false" label="Revert" label_selected="Revert"
-			     left="299" mouse_opaque="true" name="Revert" scale_image="true" width="82" />
+			     height="20" label="Revert" label_selected="Revert" left="299"
+			     mouse_opaque="true" name="Revert" scale_image="true" width="82" />
 		</panel>
 	</tab_container>
-	<scroll_container bottom="-476" follows="left|top|right|bottom" height="382" hidden="false"
-	     left="197" mouse_opaque="false" name="panel_container" opaque="false"
-	     width="292" />
-        <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" hidden="false" label="Close" label_selected="Close" right="-10"
-	     mouse_opaque="true" name="Close" scale_image="true" width="100" />
+	<scroll_container bottom="-476" follows="left|top|right|bottom" height="382" left="197"
+	     mouse_opaque="false" name="panel_container" opaque="false" width="292" />
 	<button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" hidden="false" label="Save All" label_selected="Save All"
-	     right="-116" mouse_opaque="true" name="Save All" scale_image="true"
-	     width="100" />
-        <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" hidden="false" label="Make Outfit" label_selected="Make Outfit"
-	     right="-222" mouse_opaque="true" name="Make Outfit" scale_image="true"
+	     height="20" label="Close" label_selected="Close" mouse_opaque="true"
+	     name="Close" right="-10" scale_image="true" width="100" />
+	<button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
+	     height="20" label="Save All" label_selected="Save All" mouse_opaque="true"
+	     name="Save All" right="-116" scale_image="true" width="100" />
+	<button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
+	     height="20" label="Make Outfit" label_selected="Make Outfit"
+	     mouse_opaque="true" name="Make Outfit" right="-222" scale_image="true"
 	     width="100" />
-
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml b/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
new file mode 100644
index 0000000..0622fe8
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
@@ -0,0 +1,250 @@
+<?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="275" hidden="false" left="50" min_height="180"
+     min_width="400" mouse_opaque="true" name="Day Cycle Floater"
+     rect_control="FloaterDayCycleRect" title="Day Cycle Editor" width="646">
+	<tab_container bottom="-275" follows="left|top" height="255" hidden="false" left="0"
+	     mouse_opaque="false" name="Day Cycle Tabs" tab_position="top" width="644">
+		<panel border="true" bottom="-255" follows="left|top|right|bottom" height="255"
+		     hidden="false" label="Day Cycle" left="1" mouse_opaque="false"
+		     name="Day Cycle" width="642">
+			<button bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="15"
+			     label="?" left="612" name="WLDayCycleHelp" width="18" />
+			<multi_slider allow_overlap="false" bottom="-35" can_edit_text="true"
+			     control_name="WLTimeSlider" decimal_digits="0" draw_track="false"
+			     follows="bottom" height="10" increment="0.08333333333" initial_val="0"
+			     label="" left="20" max_sliders="20" max_val="24" min_val="0"
+			     mouse_opaque="true" name="WLTimeSlider" show_text="false"
+			     use_triangle="true" value="0" width="525" />
+			<multi_slider allow_overlap="false" bottom="-60" can_edit_text="true"
+			     control_name="WLDayCycleKeys" decimal_digits="0" follows="bottom"
+			     height="10" increment="0.08333333333" initial_val="0" label="" left="20"
+			     max_sliders="20" max_val="24" min_val="0" mouse_opaque="true"
+			     name="WLDayCycleKeys" show_text="false" value="0" width="525" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-80" control_name="WL12am" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" hidden="false" left="8" mouse_opaque="true" name="WL12am"
+			     v_pad="0" width="35">
+				12am
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL3am" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL3am"
+			     v_pad="0" width="35">
+				3am
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL6am" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL6am"
+			     v_pad="0" width="35">
+				6am
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL9am" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL9amHash" v_pad="0" width="35">
+				9am
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL12pm" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL12pmHash" v_pad="0" width="35">
+				12pm
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL3pm" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL3pm"
+			     v_pad="0" width="35">
+				3pm
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL6pm" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL6pm"
+			     v_pad="0" width="35">
+				6pm
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL9pm" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL9pm"
+			     v_pad="0" width="35">
+				9pm
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL12am2" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL12am2" v_pad="0" width="35">
+				12am
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-68" control_name="WL12amHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="14" hidden="false" left="20" mouse_opaque="true" name="WL12amHash"
+			     v_pad="0" width="4">
+				|
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL3amHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="11" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL3amHash" v_pad="0" width="4">
+				I
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL6amHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="14" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL6amHash" v_pad="0" width="4">
+				|
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL9amHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="11" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL9amHash2" v_pad="0" width="4">
+				I
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL12pmHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="14" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL12pmHash2" v_pad="0" width="4">
+				|
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL3pmHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="11" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL3pmHash" v_pad="0" width="4">
+				I
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL6pmHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="14" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL6pmHash" v_pad="0" width="4">
+				|
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL9pmHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="11" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL9pmHash" v_pad="0" width="4">
+				I
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL12amHash2" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="14" hidden="false" left_delta="65" mouse_opaque="true"
+			     name="WL12amHash2" v_pad="0" width="4">
+				|
+			</text>
+			<button bottom="-40" enabled="true" font="SansSerif" halign="center" height="20"
+			     hidden="false" label="Add Key" label_selected="Add Key" left="550"
+			     mouse_opaque="true" name="WLAddKey" scale_image="true" width="80" />
+			<button bottom="-65" enabled="true" font="SansSerif" halign="center" height="20"
+			     hidden="false" label="Delete Key" label_selected="Delete Key" left="550"
+			     mouse_opaque="true" name="WLDeleteKey" scale_image="true" width="80" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-120" control_name="DayCycleText" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="16" hidden="false" left="20" mouse_opaque="true"
+			     name="WLCurKeyFrameText" v_pad="0" width="110">
+				Key Frame Settings:
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-140" control_name="DayCycleText" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="16" hidden="false" left="30" mouse_opaque="true"
+			     name="WLCurKeyTimeText" v_pad="0" width="100">
+				Key Time:
+			</text>
+			<spinner bottom_delta="-20" can_edit_text="true" control_name="WLCurKeyHour"
+			     decimal_digits="0" enabled="true" follows="left|top" height="16"
+			     increment="1" initial_val="0" label="Hour" label_width="30" left_delta="0"
+			     max_val="100" min_val="0" mouse_opaque="true" name="WLCurKeyHour"
+			     width="70" />
+			<spinner bottom_delta="0" can_edit_text="true" control_name="WLCurKeyMin"
+			     decimal_digits="0" enabled="true" follows="left|top" height="16"
+			     increment="5" initial_val="0" label="Min" label_width="20" left_delta="75"
+			     max_val="55" min_val="0" mouse_opaque="true" name="WLCurKeyMin" width="60" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="-25" control_name="WLCurKeyTimeText"
+			     drop_shadow_visible="true" follows="left|top|right" font="SansSerif"
+			     h_pad="0" halign="left" height="16" hidden="false" left="30"
+			     mouse_opaque="true" name="WLCurKeyTimeText2" v_pad="0" width="120">
+				Key Preset:
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-25" enabled="true" follows="left|top"
+			     height="18" label="Preset" left_delta="0" max_chars="20"
+			     mouse_opaque="true" name="WLKeyPresets" width="155" />
+			<view_border bevel_style="none" border_thickness="1" bottom_delta="-6" follows="top|left"
+			     height="115" left="12" width="190" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-130" control_name="DayCycleText" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="16" hidden="false" left="220" mouse_opaque="true"
+			     name="DayCycleText" v_pad="0" width="120">
+				Snap:
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-25" enabled="false" follows="left|top"
+			     height="18" label="5 min" left_delta="0" max_chars="20" mouse_opaque="true"
+			     name="WLSnapOptions" width="70" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-180" control_name="DayCycleText" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="16" hidden="false" left="220" mouse_opaque="true"
+			     name="DayCycleText2" v_pad="0" width="120">
+				Length of Cycle:
+			</text>
+			<spinner bottom_delta="-20" can_edit_text="true" control_name="WLLengthOfDayHour"
+			     decimal_digits="0" enabled="true" follows="left|top" height="16"
+			     increment="1" initial_val="0" label="Hour" label_width="30" left_delta="0"
+			     max_val="100" min_val="0" mouse_opaque="true" name="WLLengthOfDayHour"
+			     width="70" />
+			<spinner bottom_delta="0" can_edit_text="true" control_name="WLLengthOfDayMin"
+			     decimal_digits="0" enabled="true" follows="left|top" height="16"
+			     increment="1" initial_val="0" label="Min" label_width="20" left_delta="75"
+			     max_val="59" min_val="0" mouse_opaque="true" name="WLLengthOfDayMin"
+			     width="60" />
+			<spinner bottom_delta="0" can_edit_text="true" control_name="WLLengthOfDaySec"
+			     decimal_digits="0" enabled="true" follows="left|top" height="16"
+			     increment="1" initial_val="24" label="Sec" label_width="20" left_delta="65"
+			     max_val="59" min_val="0" mouse_opaque="true" name="WLLengthOfDaySec"
+			     width="60" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-130" control_name="DayCycleText" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="16" hidden="false" left="310" mouse_opaque="true"
+			     name="DayCycleText3" v_pad="0" width="120">
+				Preview:
+			</text>
+			<button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
+			     hidden="false" label="Play" label_selected="Play" left="310"
+			     mouse_opaque="true" name="WLAnimSky" scale_image="true" width="40" />
+			<button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
+			     hidden="false" label="Stop!" label_selected="Stop" left_delta="45"
+			     mouse_opaque="true" name="WLStopAnimSky" scale_image="true" width="40" />
+			<button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
+			     hidden="false" label="Use Estate Time" label_selected="Go to Estate Time"
+			     left_delta="45" mouse_opaque="true" name="WLUseLindenTime"
+			     scale_image="true" width="120" />
+			<button bottom="-170" enabled="true" font="SansSerif" halign="center" height="20"
+			     hidden="false" label="Save Test Day" label_selected="Save Test Day"
+			     left="530" mouse_opaque="true" name="WLSaveDayCycle" scale_image="true"
+			     width="100" />
+			<button bottom="-195" enabled="true" font="SansSerif" halign="center" height="20"
+			     hidden="false" label="Load Test Day" label_selected="Load Test Day"
+			     left="530" mouse_opaque="true" name="WLLoadDayCycle" scale_image="true"
+			     width="100" />
+		</panel>
+	</tab_container>
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml b/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
index c620e8b..6c27707 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
@@ -1,4 +1,7 @@
-<floater bottom="0" can_resize="false" can_minimize="true" height="260" left="0" name="floater_device_settings" can_drag_on_left="false"
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="0" can_drag_on_left="false" can_minimize="true" can_resize="false"
+     height="260" left="0" name="floater_device_settings"
      title="Voice Chat Device Settings" width="405">
-	<panel bottom="0" name="device_settings" filename="panel_audio_device.xml" left="2" top="-20" right="-5"/>
+	<panel bottom="0" filename="panel_audio_device.xml" left="2" name="device_settings"
+	     right="-5" top="-20" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index bb2fee5..aff0db9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -1,54 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" height="570" min_height="570" min_width="780"
-     name="directory" rect_control="FloaterFindRect2"
-     title="Search Second Life" 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>
-			<button bottom="-30" follows="top|left" font="SansSerifSmall" height="20" 
-				label="Back"
-				left="10" 
-				name="back_btn" width="70" />
+		     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>
+			<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" />
-			<line_editor bevel_style="in"
-						border_style="line"
-						border_thickness="1"
-						bottom_delta="0"
-						enabled="true"
-						follows="top|left|right"
-						font="SansSerif"
-						handle_edit_keys_directly="false"
-						commit_on_focus_lost="false"						
-						height="20"
-						hidden="false"
-						label="Search"
-						left_delta="80"
-						width="180"
-						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 follows="top|right" font="SansSerif" height="20"
-				label="Search"
-				left_delta="185" 
-				bottom_delta="0"
-				name="search_btn" width="70" />
-			<combo_box allow_text_entry="false"
-				bottom_delta="0" follows="right|top" height="18"
-				left_delta="100"
-			     max_chars="20" mouse_opaque="true" name="Category"
+			     label="Forward" left_delta="75" name="forward_btn" width="70" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+			     commit_on_focus_lost="false" enabled="true" follows="top|left|right"
+			     font="SansSerif" handle_edit_keys_directly="false" height="20"
+			     label="Search" left_delta="80" 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="180" />
+			<button bottom_delta="0" follows="top|right" font="SansSerif" height="20"
+			     label="Search" left_delta="185" name="search_btn" width="70" />
+			<combo_box allow_text_entry="false" bottom_delta="0" follows="right|top" height="18"
+			     left_delta="100" max_chars="20" mouse_opaque="true" name="Category"
 			     width="128">
 				<combo_item name="AnyCategory" value="All">
 					Any Category
@@ -69,43 +48,39 @@
 					Wiki
 				</combo_item>
 			</combo_box>
-			<check_box bottom_delta="0"
-				control_name="ShowMatureFindAll" follows="right|top"
+			<check_box bottom_delta="0" control_name="ShowMatureFindAll" follows="right|top"
 			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Include Mature content"
-			     left_delta="133"
-			     name="mature_check"
+			     label="Include Mature content" left_delta="133" name="mature_check"
 			     width="156" />
-			<web_browser name="find_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" />
-			<text hidden="true" name="loading_text">Loading...</text>
-			<text hidden="true" name="done_text">Done</text>
-			<text hidden="true" name="redirect_404_url">http://secondlife.com/app/search/notfound.html</text>
+			<web_browser bottom="25" follows="top|left|bottom|right" font="SansSerifSmall" left="10"
+			     name="find_browser" right="-10" top="-40" />
+			<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>
 		</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">
-						<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
-			     mouse_opaque="true" name="Next &gt;" width="80" />
-      <string name="searching_text">Searching...</string>
-      <string name="not_found_text">None Found.</string>
-      <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev" right="258"
-			     mouse_opaque="true" name="&lt; Prev" width="80" />
+			<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" />
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<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" />
 			<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"
@@ -156,8 +131,8 @@
 			     label="Browse" label_selected="Browse" left_delta="142" mouse_opaque="true"
 			     name="Browse" width="85" />
 			<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" mouse_opaque="true"
-			     name="Search" width="70" visible="false"/>
+			     label="Search" label_selected="Search" mouse_opaque="true" name="Search"
+			     visible="false" width="70" />
 			<button bottom="-26" follows="right|top" font="SansSerif" halign="center" height="20"
 			     label="Place an Ad..." label_selected="Place an Ad..." left="-140"
 			     mouse_opaque="true" name="Place an Ad..." width="125" />
@@ -179,13 +154,16 @@
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
 			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
 		</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>
-      <radio_group bottom="-40" draw_border="false" follows="left|top" height="40" left="4"
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<radio_group bottom="-40" draw_border="false" follows="left|top" height="40" left="4"
 			     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">
@@ -225,20 +203,6 @@
 			</text>
 			<combo_box allow_text_entry="false" bottom="-22" follows="left|top" height="18" left="379"
 			     max_chars="20" mouse_opaque="true" name="category combo" width="180">
-			<!--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="70">
-				Category:
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
-			     mouse_opaque="true" name="text2" v_pad="0" width="70">
-				Name/Desc:
-			</text>
-			<combo_box allow_text_entry="false" bottom="-22" follows="left|top" height="18" left="359"
-			     max_chars="20" mouse_opaque="true" name="category combo" width="200"-->
 				<combo_item name="All" value="0">
 					All
 				</combo_item>
@@ -296,7 +260,7 @@
 			     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" dynamicwidth="true" />
+				<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" />
@@ -305,32 +269,36 @@
 			     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;" right="344"
-			     mouse_opaque="true" name="Next &gt;" width="80" />
+			<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" right="258"
-			     mouse_opaque="true" name="&lt; Prev" width="80" />
+			     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="Popular Places" left="1" mouse_opaque="false" name="popular_panel"
 		     width="778">
-      <string name="searching_text">Searching...</string>
-      <string name="not_found_text">None Found.</string>
-      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
-			     mouse_opaque="true" name="Next &gt;" width="80" />
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<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" right="258"
-			     mouse_opaque="true" name="&lt; Prev" width="80" />
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
 			<check_box bottom="-22" control_name="FindPlacesPictures" follows="left|top"
 			     font="SansSerifSmall" height="16" initial_value="true"
 			     label="Only show places with pictures" left="24" mouse_opaque="true"
 			     name="incpictures" width="200" />
 			<check_box bottom_delta="-16" control_name="ShowMatureSims" follows="left|top"
 			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Include parcels with Restricted Content" left="24" mouse_opaque="true"
-			     name="incmature" width="204" />
+			     label="Include parcels with Restricted Content" left="24"
+			     mouse_opaque="true" name="incmature" width="204" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="right|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="32" left_delta="326"
@@ -347,7 +315,7 @@ the amount of time people spend there.
 			     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" dynamicwidth="true" />
+				<column dynamicwidth="true" label="Name" name="name" />
 				<column label="Traffic" name="dwell" width="70" />
 			</scroll_list>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -358,14 +326,18 @@ the amount of time people spend there.
 		<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">
-      <string name="searching_text">Searching...</string>
-      <string name="not_found_text">None Found.</string>
-      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;" right="390"
-			     mouse_opaque="true" name="Next &gt;" width="80" />
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<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="390" width="80" />
 			<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev" right="304"
-			     mouse_opaque="true" name="&lt; Prev" width="80" />
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="304" width="80" />
 			<combo_box allow_text_entry="false" bottom="-22" follows="left|top" height="18" left="4"
 			     max_chars="20" mouse_opaque="true" name="type" width="125">
 				<combo_item name="AllTypes" value="All Types">
@@ -424,7 +396,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     multi_select="false" name="results" search_column="2" width="387">
 				<column label="" name="icon" width="24" />
 				<column label="" name="type" width="-1" />
-				<column label="Name" name="name" dynamicwidth="true" />
+				<column dynamicwidth="true" label="Name" name="name" />
 				<column label="L$ Price" name="price" width="65" />
 				<column label="Area" name="area" width="50" />
 				<column label="L$/sq.m" name="per_meter" width="65" />
@@ -437,14 +409,18 @@ To buy direct, visit the land and click on the place name in the title bar.
 		<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>
-      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
-			     mouse_opaque="true" name="Next &gt;" width="80" />
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<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" right="258"
-			     mouse_opaque="true" name="&lt; Prev" width="80" />
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
 			<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"
@@ -456,8 +432,8 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     max_length="63" mouse_opaque="true" name="name" width="128" />
 			<check_box bottom_delta="-18" control_name="ShowMatureSims" follows="left|top"
 			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Include parcels with Mature content" left_delta="0" mouse_opaque="true"
-			     name="incmature" width="204" />
+			     label="Include parcels with Mature content" left_delta="0"
+			     mouse_opaque="true" name="incmature" width="204" />
 			<combo_box allow_text_entry="false" bottom="-24" follows="left|top" height="18" left="182"
 			     max_chars="20" mouse_opaque="true" name="Category" width="128">
 				<combo_item name="AnyCategory" value="any">
@@ -503,26 +479,14 @@ To buy direct, visit the land and click on the place name in the title bar.
 			<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
 			     name="Search" width="70" />
-			<scroll_list 
-				 name="results" 
-				 background_visible="false" 
-				 bottom="-513" 
-				 column_padding="0" 
-				 draw_border="true"
-			     draw_heading="true" 
-			     fg_disable_color="1, 1, 1, 1"
-			     fg_selected_color="1, 1, 1, 1" 
-			     fg_unselected_color="1, 1, 1, 1"
-			     follows="left|top|right|bottom" 
-			     height="464" 
-			     left="4" 
-			     mouse_opaque="true"
-			     multi_select="false"
-			     search_column="2" 
-			     width="339">
+			<scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+			     draw_heading="true" fg_disable_color="1, 1, 1, 1"
+			     fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+			     follows="left|top|right|bottom" height="464" 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" dynamicwidth="true" />
+				<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"
@@ -533,14 +497,18 @@ To buy direct, visit the land and click on the place name in the title bar.
 		<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>
-      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;" right="330"
-			     mouse_opaque="true" name="Next &gt;" width="80" />
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<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" right="244"
-			     mouse_opaque="true" name="&lt; Prev" width="80" />
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
 			<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"
@@ -570,20 +538,24 @@ To buy direct, visit the land and click on the place name in the title bar.
 		<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>
-      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
-			     mouse_opaque="true" name="Next &gt;" width="80" />
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<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" right="258"
-			     mouse_opaque="true" name="&lt; Prev" width="80" />
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
 			<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>			
+			</text>
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
 			     follows="left|top" font="SansSerif" height="18" left_delta="38"
 			     max_length="63" mouse_opaque="true" name="name" width="200" />
@@ -594,17 +566,16 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Include Mature groups" left="42" mouse_opaque="true"
 			     name="incmature" width="204" />
-		
 			<scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
 			     draw_heading="true" fg_disable_color="1, 1, 1, 1"
 			     fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
 			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
 			     multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" width="24" sort="score" sort_ascending="false" />
+				<column label="" name="icon" sort="score" sort_ascending="false" width="24" />
 				<column label="" name="type" width="-1" />
-				<column label="Name" name="name" dynamicwidth="true" />
-				<column label="Members" name="members" width="100" halign="left" sort_ascending="false" />
-				<column label="" name="score" width="-1"/>
+				<column dynamicwidth="true" label="Name" name="name" />
+				<column halign="left" label="Members" name="members" sort_ascending="false" width="100" />
+				<column label="" name="score" 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"
@@ -612,11 +583,15 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
 		</panel>
 		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="All (old)" left="1" mouse_opaque="false"
-		     name="find_all_old_panel" width="778">
-      <string name="searching_text">Searching...</string>
-      <string name="not_found_text">None Found.</string>
-      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+		     label="All (old)" left="1" mouse_opaque="false" name="find_all_old_panel"
+		     width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
 			     height="20" label="&lt; Prev" label_selected="&lt; Prev" left="80"
 			     mouse_opaque="true" name="&lt; Prev" width="60" />
 			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
@@ -660,13 +635,19 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
 		</panel>
 	</tab_container>
-	<panel follows="right|top" bottom="-560" height="470" left="340" name="classified_details_panel" width="440" />
-	<panel follows="right|top" bottom="-560" height="486" left="350" name="Panel Avatar" width="430" />
-	<panel follows="right|top" bottom="-560" height="470" left="340" name="event_details_panel" width="440" />
-	<panel follows="right|top" bottom="-580" height="515" left="350" name="group_details_panel_holder" width="430">
-		<panel follows="right|top" bottom="0" height="470" left="0" name="group_details_panel" width="430" />
+	<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 follows="right|top" bottom="20" height="470" left="340" name="place_details_panel" width="440" />
-	<panel follows="right|top" bottom="20" height="470" left="385" name="place_details_small_panel"
-	     width="395" />
+	<panel bottom="20" follows="right|top" height="470" left="340"
+	     name="place_details_panel" width="440" />
+	<panel bottom="20" follows="right|top" height="470" left="385"
+	     name="place_details_small_panel" width="395" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml
new file mode 100644
index 0000000..31feeb4
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml
@@ -0,0 +1,66 @@
+<?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" hidden="false" 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" hidden="false"
+	     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" hidden="false"
+	     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" hidden="false"
+	     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" hidden="false"
+	     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" hidden="false" 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" hidden="false"
+	     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/xui/en-us/floater_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_friends.xml
index ffc938c..540b066 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_friends.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
      min_height="300" min_width="350" name="friends"
      rect_control="FloaterFriendsRect" title="Friends">
@@ -22,20 +23,17 @@
 			Select friend(s) to change rights...
 		</text>
 		<check_box bottom_delta="-21" enabled="false" follows="bottom|left" font="SansSerifSmall"
-		     height="16" hidden="false" initial_value="false"
-		     label="Can see my online status" left="10" mouse_opaque="true"
-		     name="online_status_cb" radio_style="false"
+		     height="16" initial_value="false" label="Can see my online status"
+		     left="10" mouse_opaque="true" name="online_status_cb" radio_style="false"
 		     tool_tip="Set whether this friend see my online status in their friends list or calling cards"
 		     width="200" />
 		<check_box bottom_delta="-18" enabled="false" follows="bottom|left" font="SansSerifSmall"
-		     height="16" hidden="false" initial_value="false"
-		     label="Can see me on the map" left="25" mouse_opaque="true"
-		     name="map_status_cb" radio_style="false"
+		     height="16" initial_value="false" label="Can see me on the map" left="25"
+		     mouse_opaque="true" name="map_status_cb" radio_style="false"
 		     tool_tip="Set whether this friend see my location on their map" width="200" />
 		<check_box bottom_delta="-18" enabled="false" follows="bottom|left" font="SansSerifSmall"
-		     height="16" hidden="false" initial_value="false"
-		     label="Can modify my objects" left="10" mouse_opaque="true"
-		     name="modify_status_cb" radio_style="false"
+		     height="16" initial_value="false" label="Can modify my objects" left="10"
+		     mouse_opaque="true" name="modify_status_cb" radio_style="false"
 		     tool_tip="Set whether this friend can modify my objects" width="200" />
 		<text bottom_delta="25" follows="top|left" font="SansSerif" left="10"
 		     name="process_rights_label">
@@ -61,5 +59,7 @@
 	<button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
 	     label="Add..." left_delta="0" name="add_btn"
 	     tool_tip="Offer friendship to a resident" width="80" />
-	<text hidden="true" name="Multiple">Multiple friends...</text>
+	<string name="Multiple">
+		Multiple friends...
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_god_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_god_tools.xml
index 2178b4a..ee70387 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_god_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_god_tools.xml
@@ -1,270 +1,244 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-534" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="384" hidden="false" left="433" min_height="384"
-     min_width="400" mouse_opaque="true" name="godtools floater"
-     title="God Tools" width="400">
-	<tab_container bottom="-384" follows="left|top" height="364" hidden="false" left="0"
-	     mouse_opaque="false" name="GodTools Tabs" tab_position="top" width="400">
+     can_resize="false" height="384" left="433" min_height="384" min_width="400"
+     mouse_opaque="true" name="godtools floater" title="God Tools" width="400">
+	<tab_container bottom="-384" follows="left|top" height="364" left="0" mouse_opaque="false"
+	     name="GodTools Tabs" tab_position="top" width="400">
 		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
-		     hidden="false" label="Grid" left="1" mouse_opaque="false" name="grid"
-		     width="398">
+		     label="Grid" left="1" mouse_opaque="false" name="grid" width="398">
 			<button bottom="-28" follows="left|top" font="SansSerif" halign="center" height="20"
-			     hidden="false" label="Kick all users" label_selected="Kick all users"
-			     left="10" mouse_opaque="true" name="Kick all users" width="100" />
+			     label="Kick all users" label_selected="Kick all users" left="10"
+			     mouse_opaque="true" name="Kick all users" width="100" />
 			<button bottom_delta="-28" follows="left|top" font="SansSerif" halign="center"
-			     height="20" hidden="false"
-			     label="Flush This Region&apos;s Map Visibility Caches"
+			     height="20" label="Flush This Region&apos;s Map Visibility Caches"
 			     label_selected="Flush This Region&apos;s Map Visibility Caches" left="10"
 			     mouse_opaque="true" name="Flush This Region&apos;s Map Visibility Caches"
 			     width="250" />
 		</panel>
 		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
-		     hidden="false" label="Region" left="1" mouse_opaque="false" name="region"
-		     width="398">
+		     label="Region" left="1" mouse_opaque="false" name="region" width="398">
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="Sim Name:" v_pad="0" width="50">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Sim Name:" v_pad="0" width="50">
 				Sim Name:
 			</text>
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
-			     follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-			     left="70" max_length="63" mouse_opaque="true" name="region name"
-			     width="208" />
+			     follows="left|top|right" font="SansSerifSmall" height="16" left="70"
+			     max_length="63" mouse_opaque="true" name="region name" width="208" />
 			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Prelude" left="10"
-			     mouse_opaque="true" name="check prelude"
-			     tool_tip="Set this to make the region a prelude." width="180" />
+			     initial_value="false" label="Prelude" left="10" mouse_opaque="true"
+			     name="check prelude" tool_tip="Set this to make the region a prelude."
+			     width="180" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Fixed Sun" left="10"
-			     mouse_opaque="true" name="check fixed sun"
+			     initial_value="false" label="Fixed Sun" left="10" mouse_opaque="true"
+			     name="check fixed sun"
 			     tool_tip="Fix the sun position (like in Region/Estate &gt; Terrain."
 			     width="180" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Reset Home On Teleport"
-			     left="10" mouse_opaque="true" name="check reset home"
+			     initial_value="false" label="Reset Home On Teleport" left="10"
+			     mouse_opaque="true" name="check reset home"
 			     tool_tip="When resident teleports out, reset their home to the destination position."
 			     width="180" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Visible" left="10"
-			     mouse_opaque="true" name="check visible"
+			     initial_value="false" label="Visible" left="10" mouse_opaque="true"
+			     name="check visible"
 			     tool_tip="Set this to make the region visible to non-gods." width="180" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Damage" left="10"
-			     mouse_opaque="true" name="check damage"
-			     tool_tip="Set this to enable damage in this region." width="180" />
+			     initial_value="false" label="Damage" left="10" mouse_opaque="true"
+			     name="check damage" tool_tip="Set this to enable damage in this region."
+			     width="180" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Block Traffic Tracking"
-			     left="10" mouse_opaque="true" name="block dwell"
+			     initial_value="false" label="Block Traffic Tracking" left="10"
+			     mouse_opaque="true" name="block dwell"
 			     tool_tip="Set this to make the region not compute traffic." width="180" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Block Terraform" left="10"
-			     mouse_opaque="true" name="block terraform"
+			     initial_value="false" label="Block Terraform" left="10" mouse_opaque="true"
+			     name="block terraform"
 			     tool_tip="Set this to disallow people terraforming their land" width="180" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Sandbox" left="10"
-			     mouse_opaque="true" name="is sandbox"
-			     tool_tip="Toggle whether this is a sandbox region." width="180" />
+			     initial_value="false" label="Sandbox" left="10" mouse_opaque="true"
+			     name="is sandbox" tool_tip="Toggle whether this is a sandbox region."
+			     width="180" />
 			<button bottom_delta="-52" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Bake Terrain"
-			     label_selected="Bake Terrain" left="8" mouse_opaque="true"
-			     name="Bake Terrain" tool_tip="Save the current terrain as default."
-			     width="110" />
+			     height="20" label="Bake Terrain" label_selected="Bake Terrain" left="8"
+			     mouse_opaque="true" name="Bake Terrain"
+			     tool_tip="Save the current terrain as default." width="110" />
 			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Revert Terrain"
-			     label_selected="Revert Terrain" left="8" mouse_opaque="true"
-			     name="Revert Terrain" tool_tip="Replace the current terrain with default."
-			     width="110" />
+			     height="20" label="Revert Terrain" label_selected="Revert Terrain" left="8"
+			     mouse_opaque="true" name="Revert Terrain"
+			     tool_tip="Replace the current terrain with default." width="110" />
 			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Swap Terrain"
-			     label_selected="Swap Terrain" left="8" mouse_opaque="true"
-			     name="Swap Terrain" tool_tip="Swap current terrain with default."
-			     width="110" />
+			     height="20" label="Swap Terrain" label_selected="Swap Terrain" left="8"
+			     mouse_opaque="true" name="Swap Terrain"
+			     tool_tip="Swap current terrain with default." width="110" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-46" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" hidden="false" left="200"
-			     mouse_opaque="true" name="estate id" v_pad="0" width="190">
+			     h_pad="0" halign="left" height="16" left="200" mouse_opaque="true"
+			     name="estate id" v_pad="0" width="190">
 				Estate ID:
 			</text>
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
-			     follows="top|right" font="SansSerifSmall" height="16" hidden="false"
-			     left_delta="108" max_length="10" mouse_opaque="true" name="estate"
-			     width="50" />
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="108"
+			     max_length="10" mouse_opaque="true" name="estate" width="50" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-66" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" hidden="false" left="200"
-			     mouse_opaque="true" name="parent id" v_pad="0" width="190">
+			     h_pad="0" halign="left" height="16" left="200" mouse_opaque="true"
+			     name="parent id" v_pad="0" width="190">
 				Parent ID:
 			</text>
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-66"
-			     follows="top|right" font="SansSerifSmall" height="16" hidden="false"
-			     left_delta="108" max_length="10" mouse_opaque="true" name="parentestate"
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="108"
+			     max_length="10" mouse_opaque="true" name="parentestate"
 			     tool_tip="This is the parent estate for this region" width="50" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-86" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="200" mouse_opaque="true" name="Grid Pos: " v_pad="0" width="190">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
+			     mouse_opaque="true" name="Grid Pos: " v_pad="0" width="190">
 				Grid Pos:
 			</text>
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-86"
-			     follows="top|right" font="SansSerifSmall" height="16" hidden="false"
-			     left_delta="88" max_length="10" mouse_opaque="true" name="gridposx"
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="88"
+			     max_length="10" mouse_opaque="true" name="gridposx"
 			     tool_tip="This is the grid x position for this region" width="50" />
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-86"
-			     follows="top|right" font="SansSerifSmall" height="16" hidden="false"
-			     left_delta="60" max_length="10" mouse_opaque="true" name="gridposy"
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="60"
+			     max_length="10" mouse_opaque="true" name="gridposy"
 			     tool_tip="This is the grid y position for this region" width="40" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-106" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="200" mouse_opaque="true" name="Redirect to Grid: " v_pad="0"
-			     width="190">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
+			     mouse_opaque="true" name="Redirect to Grid: " v_pad="0" width="190">
 				Redirect to Grid:
 			</text>
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-106"
-			     follows="top|right" font="SansSerifSmall" height="16" hidden="false"
-			     left_delta="88" max_length="10" mouse_opaque="true" name="redirectx"
-			     width="50" />
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="88"
+			     max_length="10" mouse_opaque="true" name="redirectx" width="50" />
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-106"
-			     follows="top|right" font="SansSerifSmall" height="16" hidden="false"
-			     left_delta="60" max_length="10" mouse_opaque="true" name="redirecty"
-			     width="40" />
-			<spinner bottom="-126" decimal_digits="3" follows="top|right" height="16" hidden="false"
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="60"
+			     max_length="10" mouse_opaque="true" name="redirecty" width="40" />
+			<spinner bottom="-126" decimal_digits="3" follows="top|right" height="16"
 			     increment="0.1" initial_val="1" left="308" max_val="4" min_val="0"
 			     mouse_opaque="true" name="billable factor" width="80" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-126" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left_delta="-108" mouse_opaque="true" name="billable factor text" v_pad="0"
-			     width="110">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
+			     mouse_opaque="true" name="billable factor text" v_pad="0" width="110">
 				Billable Factor:
 			</text>
-			<spinner bottom="-146" decimal_digits="3" follows="top|right" height="16" hidden="false"
-			     increment="1" initial_val="1" left="308" max_val="100" min_val="0"
-			     mouse_opaque="true" name="land cost" width="80" />
+			<spinner bottom="-146" decimal_digits="3" follows="top|right" height="16" increment="1"
+			     initial_val="1" left="308" max_val="100" min_val="0" mouse_opaque="true"
+			     name="land cost" width="80" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-146" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-			     left_delta="-108" mouse_opaque="true" name="land cost text" v_pad="0"
-			     width="110">
+			     font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
+			     mouse_opaque="true" name="land cost text" v_pad="0" width="110">
 				L$ per sq. meter:
 			</text>
 			<button bottom="-170" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Refresh" label_selected="Refresh"
-			     left="278" mouse_opaque="true" name="Refresh"
+			     height="20" label="Refresh" label_selected="Refresh" left="278"
+			     mouse_opaque="true" name="Refresh"
 			     tool_tip="Click here to refresh the above information." width="110" />
 			<button bottom_delta="-56" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Apply" label_selected="Apply" left="278"
+			     height="20" label="Apply" label_selected="Apply" left="278"
 			     mouse_opaque="true" name="Apply"
 			     tool_tip="Click here to apply any changes from above." width="110" />
 			<button bottom="-258" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Select Region"
-			     label_selected="Select Region" left="128" mouse_opaque="true"
-			     name="Select Region" tool_tip="Select the whole region with the land tool."
-			     width="110" />
+			     height="20" label="Select Region" label_selected="Select Region" left="128"
+			     mouse_opaque="true" name="Select Region"
+			     tool_tip="Select the whole region with the land tool." width="110" />
 			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Autosave now"
-			     label_selected="Autosave now" left="128" mouse_opaque="true"
-			     name="Autosave now" tool_tip="Save gzipped state to autosave directory."
-			     width="110" />
+			     height="20" label="Autosave now" label_selected="Autosave now" left="128"
+			     mouse_opaque="true" name="Autosave now"
+			     tool_tip="Save gzipped state to autosave directory." width="110" />
 		</panel>
 		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
-		     hidden="false" label="Objects" left="1" mouse_opaque="false" name="objects"
-		     width="398">
+		     label="Objects" left="1" mouse_opaque="false" name="objects" width="398">
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="Sim Name:" v_pad="0" width="50">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Sim Name:" v_pad="0" width="50">
 				Sim Name:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left_delta="60" mouse_opaque="true" name="region name" v_pad="0"
-			     width="320">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="60"
+			     mouse_opaque="true" name="region name" v_pad="0" width="320">
 				Welsh
 			</text>
 			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Disable Scripts" left="10"
-			     mouse_opaque="true" name="disable scripts"
+			     initial_value="false" label="Disable Scripts" left="10" mouse_opaque="true"
+			     name="disable scripts"
 			     tool_tip="Set this to disable all scripts in this region" width="110" />
 			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Disable Collisions"
-			     left_delta="120" mouse_opaque="true" name="disable collisions"
+			     initial_value="false" label="Disable Collisions" left_delta="120"
+			     mouse_opaque="true" name="disable collisions"
 			     tool_tip="Set this to disable non-agent collisions in this region"
 			     width="121" />
 			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Disable Physics"
-			     left_delta="120" mouse_opaque="true" name="disable physics"
+			     initial_value="false" label="Disable Physics" left_delta="120"
+			     mouse_opaque="true" name="disable physics"
 			     tool_tip="Set this to disable all physics in this region" width="130" />
 			<button bottom="-74" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Apply" label_selected="Apply" left="278"
+			     height="20" label="Apply" label_selected="Apply" left="278"
 			     mouse_opaque="true" name="Apply"
 			     tool_tip="Click here to apply any changes from above." width="110" />
 			<button bottom="-98" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Set Target" label_selected="Set Target"
-			     left="8" mouse_opaque="true" name="Set Target"
+			     height="20" label="Set Target" label_selected="Set Target" left="8"
+			     mouse_opaque="true" name="Set Target"
 			     tool_tip="Set the target avatar for object deletion." width="110" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-88" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="130" mouse_opaque="true" name="target_avatar_name" v_pad="0"
-			     width="260">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="130"
+			     mouse_opaque="true" name="target_avatar_name" v_pad="0" width="260">
 				(no target)
 			</text>
 			<button bottom="-146" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false"
-			     label="Delete Target&apos;s Scripted Objects On Others Land"
+			     height="20" label="Delete Target&apos;s Scripted Objects On Others Land"
 			     label_selected="Delete Target&apos;s Scripted Objects On Others Land"
 			     left="8" mouse_opaque="true"
 			     name="Delete Target&apos;s Scripted Objects On Others Land"
 			     tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned."
 			     width="380" />
 			<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false"
-			     label="Delete Target&apos;s Scripted Objects On *Any* Land"
+			     height="20" label="Delete Target&apos;s Scripted Objects On *Any* Land"
 			     label_selected="Delete Target&apos;s Scripted Objects On *Any* Land"
 			     left="8" mouse_opaque="true"
 			     name="Delete Target&apos;s Scripted Objects On *Any* Land"
 			     tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned."
 			     width="380" />
 			<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Delete *ALL* Of Target&apos;s Objects"
+			     height="20" label="Delete *ALL* Of Target&apos;s Objects"
 			     label_selected="Delete *ALL* Of Target&apos;s Objects" left="8"
 			     mouse_opaque="true" name="Delete *ALL* Of Target&apos;s Objects"
 			     tool_tip="Delete all objects owned by the target in this region. (no copy) objects will be returned."
 			     width="380" />
 			<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Get Top Colliders"
-			     label_selected="Get Top Colliders" left="8" mouse_opaque="true"
-			     name="Get Top Colliders"
+			     height="20" label="Get Top Colliders" label_selected="Get Top Colliders"
+			     left="8" mouse_opaque="true" name="Get Top Colliders"
 			     tool_tip="Gets list of objects experiencing the most narrowphase callbacks."
 			     width="110" />
 			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Get Top Scripts"
-			     label_selected="Get Top Scripts" left="8" mouse_opaque="true"
-			     name="Get Top Scripts"
+			     height="20" label="Get Top Scripts" label_selected="Get Top Scripts"
+			     left="8" mouse_opaque="true" name="Get Top Scripts"
 			     tool_tip="Gets list of objects spending the most time running scripts."
 			     width="110" />
 			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" hidden="false" label="Scripts digest"
-			     label_selected="Scripts digest" left="8" mouse_opaque="true"
-			     name="Scripts digest"
+			     height="20" label="Scripts digest" label_selected="Scripts digest" left="8"
+			     mouse_opaque="true" name="Scripts digest"
 			     tool_tip="Gets a list of all scripts and number of occurences of each."
 			     width="110" />
 		</panel>
 		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
-		     hidden="false" label="Request" left="1" mouse_opaque="true" name="request"
-		     width="398">
+		     label="Request" left="1" mouse_opaque="true" name="request" width="398">
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="Destination:" v_pad="0" width="80">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Destination:" v_pad="0" width="80">
 				Destination:
 			</text>
-			<combo_box allow_text_entry="false" bottom="-20" follows="left|top" height="16"
-			     hidden="false" left="100" max_chars="20" mouse_opaque="true"
-			     name="destination" width="290">
+			<combo_box allow_text_entry="false" bottom="-20" follows="left|top" height="16" left="100"
+			     max_chars="20" mouse_opaque="true" name="destination" width="290">
 				<combo_item name="Selection" value="Selection">
 					Selection
 				</combo_item>
@@ -274,13 +248,12 @@
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-38" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="Request:" v_pad="0" width="80">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Request:" v_pad="0" width="80">
 				Request:
 			</text>
-			<combo_box allow_text_entry="true" bottom="-44" follows="left|top" height="16"
-			     hidden="false" left="100" max_chars="20" mouse_opaque="true" name="request"
-			     width="290">
+			<combo_box allow_text_entry="true" bottom="-44" follows="left|top" height="16" left="100"
+			     max_chars="20" mouse_opaque="true" name="request" width="290">
 				<combo_item name="colliders&lt;steps&gt;" value="colliders &lt;steps&gt;">
 					colliders &lt;steps&gt;
 				</combo_item>
@@ -297,15 +270,15 @@
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-62" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="Parameter:" v_pad="0" width="80">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Parameter:" v_pad="0" width="80">
 				Parameter:
 			</text>
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-68"
-			     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-			     left="100" max_length="63" mouse_opaque="true" name="parameter" width="290" />
+			     follows="left|top" font="SansSerifSmall" height="16" left="100"
+			     max_length="63" mouse_opaque="true" name="parameter" width="290" />
 			<button bottom="-116" follows="left|top" font="SansSerif" halign="center" height="20"
-			     hidden="false" label="Make Request" label_selected="Make Request" left="10"
+			     label="Make Request" label_selected="Make Request" left="10"
 			     mouse_opaque="true" name="Make Request" width="100" />
 		</panel>
 	</tab_container>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_groups.xml b/linden/indra/newview/skins/xui/en-us/floater_groups.xml
index a3c43ad..ceeefd9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_groups.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_groups.xml
@@ -1,45 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-371" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" can_tear_off="false" enabled="true" follows="left|top"
-     height="300" hidden="false" left="280" min_height="250" min_width="350"
+     height="300" left="280" min_height="250" min_width="350"
      mouse_opaque="true" name="groups" title="Groups" width="350">
 	<scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"
 	     draw_heading="false" draw_stripes="true" enabled="true"
-	     follows="left|top|right|bottom" hidden="false" left="10"
-	     mouse_opaque="true" multi_select="false" name="group list" tab_stop="true"
-	     top="-20" width="240">
+	     follows="left|top|right|bottom" left="10" mouse_opaque="true"
+	     multi_select="false" name="group list" tab_stop="true" top="-20"
+	     width="240">
 		<column label="" name="name" width="248" />
 	</scroll_list>
 	<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|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="12" mouse_opaque="false" name="groupdesc" v_pad="0"
-	     width="248">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupdesc" v_pad="0" width="248">
 		Your currently active group is displayed in bold.
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="12" mouse_opaque="false" name="groupcount" v_pad="0"
-	     width="248">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupcount" v_pad="0" width="248">
 		You belong to [COUNT] groups (of [MAX] maximum).
 	</text>
 	<pad bottom="-17" height="0" left="-90" width="1" />
-	<button bottom_delta="-25" follows="top|right"
-	     font="SansSerif" height="22" hidden="false" label="Info" name="Info"
-	     width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Info" name="Info" width="80" />
 	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
 	     label="IM/Call" left_delta="0" name="IM"
 	     tool_tip="Open Instant Message session" width="80" />
-	<button bottom_delta="-25" follows="top|right"
-	     font="SansSerif" height="22" hidden="false" label="Activate"
-	     name="Activate" width="80" />
-	<button bottom_delta="-25" follows="top|right"
-	     font="SansSerif" height="22" hidden="false" label="Leave" name="Leave"
-	     width="80" />
-	<button bottom_delta="-35" follows="top|right"
-	     font="SansSerif" height="22" hidden="false" label="Create..." name="Create"
-	     width="80" />
-	<button bottom_delta="-25" follows="top|right"
-	     font="SansSerif" height="22" hidden="false" label="Search..."
-	     name="Search..." width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Activate" name="Activate" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Leave" name="Leave" width="80" />
+	<button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
+	     label="Create..." name="Create" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Search..." name="Search..." width="80" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml
new file mode 100644
index 0000000..64a3c6b
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-400" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="205" hidden="false" left="50" min_height="200"
+     min_width="600" mouse_opaque="true" name="Hardware Settings Floater"
+     title="Hardware Settings" width="500">
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-42" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="10" mouse_opaque="true" name="Filtering:" v_pad="0" width="128">
+		Filtering:
+	</text>
+	<check_box bottom="-46" control_name="RenderAnisotropic" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	     label="Anisotropic Filtering (slower when enabled)" left="148"
+	     mouse_opaque="true" name="ani" radio_style="false" width="256" />
+	<spinner bottom="-65" control_name="RenderGamma" decimal_digits="2" enabled="true"
+	     follows="left|top" height="16" hidden="false" increment="0.01"
+	     initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2"
+	     min_val="0.0" mouse_opaque="true" name="gamma" width="202" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-61" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="222" mouse_opaque="true" name="(brightness, lower is brighter)"
+	     v_pad="0" width="315">
+		(brightness, lower is brighter, 0=use default)
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-104" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="10" mouse_opaque="true" name="Enable VBO:" v_pad="0" width="128">
+		Enable VBO:
+	</text>
+	<check_box bottom="-108" control_name="RenderVBOEnable" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+	     label="Enable OpenGL Vertex Buffer Objects" left="148" mouse_opaque="true"
+	     name="vbo" radio_style="false"
+	     tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
+	     width="315" />
+	<slider bottom="-133" can_edit_text="false" control_name="TextureMemory"
+	     decimal_digits="0" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="16" initial_val="32" label="Texture Memory (MB):"
+	     label_width="135" left="10" max_val="4096" min_val="0" mouse_opaque="true"
+	     name="GrapicsCardTextureMemory"
+	     tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry."
+	     width="300" />
+	<spinner bottom="-157" control_name="RenderFogRatio" decimal_digits="1" enabled="true"
+	     follows="left|top" height="16" hidden="false" increment="0.1"
+	     initial_val="4" label="Fog Distance Ratio:" label_width="138" left="10"
+	     max_val="10" min_val="0.5" mouse_opaque="true" name="fog" width="202" />
+	<button bottom="10" enabled="true" follows="right|bottom" font="SansSerif"
+	     halign="center" height="20" hidden="false" label="OK" label_selected="OK"
+	     left="-110" mouse_opaque="true" name="OK" scale_image="true" width="90" />
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_html.xml b/linden/indra/newview/skins/xui/en-us/floater_html.xml
index fe295c7..3dfbdb1 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_html.xml
@@ -1,36 +1,28 @@
 <?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="500" min_height="300" min_width="400" name="htmlfloater"
-     title="" width="700">
+     height="500" min_height="300" min_width="400" name="htmlfloater" title=""
+     width="700">
 	<button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20"
 	     label="Close" name="close_btn" right="-10" width="80" />
 	<web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
 	     name="html_floater_browser" right="-15" top="-56" />
 	<button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Back"
-	     left="15" name="back_btn" width="80" />
-<!-- 	<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20" -->
-<!-- 	     label="Home" left_delta="75" name="home_btn" width="70" /> -->
+	     left="15" name="back_btn" width="70" />
 	<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-	     label="Forward" left_delta="83" name="forward_btn" width="80" />
-	     
+	     label="Forward" left_delta="73" name="forward_btn" width="70" />
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-	     follows="top|left|right" font="SansSerifSmall" height="20" hidden="false" left_delta="85" max_length="256" mouse_opaque="true"
-	     name="url_edit" select_all_on_focus_received="true" width="435" />
+	     follows="top|left|right" font="SansSerifSmall" height="20" left_delta="85"
+	     max_length="256" mouse_opaque="true" name="url_edit"
+	     select_all_on_focus_received="true" width="435" />
 	<button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
 	     label="Go" left_delta="440" name="go_btn" width="70" />
-     	     
-	<!-- web_browser bottom="20" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
-	     name="html_floater_browser" right="-15" top="-56" / -->
-
-	<text hidden="true" name="home_page_url">http://www.secondlife.com</text>
-	
-	<text hidden="true" name="in-world_help_title">In-World Help</text>
-	<text hidden="true" name="in-world_help_url">
-		http://www.secondlife.com/app/support/inworld.html
-	</text>
-	
-	<text hidden="true" name="additional_help_title">Additional Help</text>
-	<text hidden="true" name="additional_help_url">
-		http://www.secondlife.com/app/support/support.html
-	</text>
+	<string name="home_page_url">
+		http://www.secondlife.com
+	</string>
+	<string name="f1_help_title">
+		Second Life Help
+	</string>
+	<string name="f1_help_url">
+		http://secondlife.com/app/support/
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_im.xml b/linden/indra/newview/skins/xui/en-us/floater_im.xml
index ae14c00..caf54e3 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_im.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_im.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater bottom="-690" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" enabled="true" follows="left|bottom" height="422"
-     hidden="false" left="294" min_height="130" min_width="350"
-     mouse_opaque="true" name="im_floater" rect_control="FloaterIMRect"
-     title="Instant Message" width="419">
+     left="294" min_height="130" min_width="350" mouse_opaque="true"
+     name="im_floater" rect_control="FloaterIMRect" title="Instant Message"
+     width="419">
 	<tab_container border="false" bottom="-422" enabled="true" follows="left|top|right|bottom"
-	     height="406" hidden="false" left="1" mouse_opaque="false"
-	     name="Preview Tabs" tab_position="bottom" width="417" />
+	     height="406" left="1" mouse_opaque="false" name="Preview Tabs"
+	     tab_position="bottom" width="417" />
 	<string name="only_user_message">
 		You are the only user in this session.
 	</string>
@@ -16,38 +16,37 @@
 	<string name="invite_message">
 		Click the [BUTTON NAME] button to accept/connect to this voice chat.
 	</string>
-
 	<string name="generic_request_error">
-	    Error making request, please try again later.
+		Error making request, please try again later.
 	</string>
 	<string name="insufficient_perms_error">
-	    You do not have sufficient permissions.
+		You do not have sufficient permissions.
 	</string>
 	<string name="session_does_not_exist_error">
-	    The session no longer exists
+		The session no longer exists
 	</string>
 	<string name="no_ability_error">
-	    You do not have that ability.
+		You do not have that ability.
 	</string>
 	<string name="not_a_mod_error">
-	    You are not a session moderator.
+		You are not a session moderator.
 	</string>
 	<string name="muted_error">
-	    You have been muted.
+		You have been muted.
 	</string>
 	<string name="add_session_event">
-	    adding agents to chat session with
+		adding agents to chat session with
 	</string>
 	<string name="message_session_event">
-	    messaging chat session with
+		messaging chat session with
 	</string>
 	<string name="mute_agent_event">
-	    muting agent in
+		muting agent in
 	</string>
 	<string name="removed_from_group">
-	    You have been removed from the group.
+		You have been removed from the group.
 	</string>
 	<string name="close_on_no_ability">
-	    You no longer have the ability to be in the chat session
+		You no longer have the ability to be in the chat session
 	</string>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml
index 17a97f5..926e715 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml
@@ -49,14 +49,14 @@
 		</combo_item>
 	</combo_box>
 	<text bottom="250" follows="top|left" left="10" name="bad_image_text">
-Unable to read image.
+		Unable to read image.
 
 Try saving image as 24 bit Targa (.tga).
 	</text>
-	<check_box bottom="37" follows="bottom|left" enabled="false"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Use lossless compression" left="10"
-             left_delta="2" name="lossless_check" control_name="LosslessJ2CUpload" width="280" />
+	<check_box bottom="37" control_name="LosslessJ2CUpload" enabled="false"
+	     follows="bottom|left" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Use lossless compression" left="10"
+	     left_delta="2" name="lossless_check" width="280" />
 	<button bottom="10" follows="bottom|right" height="20" label="Cancel" left="165"
 	     name="cancel_btn" width="125" />
 	<button bottom="10" follows="bottom|left" height="20" label="Upload (L$[AMOUNT])"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inspect.xml b/linden/indra/newview/skins/xui/en-us/floater_inspect.xml
index bc8026b..11f6db3 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inspect.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inspect.xml
@@ -1,39 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
-	name="inspect"
-	title="Inspect Objects"
-	can_resize="true"
-	can_minimize="true"
-	can_close="true"
-	can_drag_on_left="false"
-	rect_control="FloaterInspectRect"
-	min_width="400"
-	min_height="300"
-	>
-	<scroll_list
-		name="object_list"
-		left="10"
-		right="-10"
-		top="-20"
-		bottom="30"	
-		column_padding="0"
-		can_resize="false"
-		follows="top|right|left|bottom"
-		draw_heading="true"
-		multi_select="false"
-		tool_tip="Select an object from this list to highlight it in-world"
-	   >
-		<column name="object_name" label="Object Name" type="text" dynamicwidth="true" />
-		<column name="owner_name" label="Owner Name" type="text" dynamicwidth="true" />
-		<column name="creator_name" label="Creator Name" type="text" dynamicwidth="true" />
-		<column name="creation_date" label="Creation Date" type="text" width="150" />
-	</scroll_list>	
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+     min_height="300" min_width="400" name="inspect"
+     rect_control="FloaterInspectRect" title="Inspect Objects">
+	<scroll_list bottom="30" can_resize="false" column_padding="0" draw_heading="true"
+	     follows="top|right|left|bottom" left="10" multi_select="false"
+	     name="object_list" right="-10"
+	     tool_tip="Select an object from this list to highlight it in-world"
+	     top="-20">
+		<column dynamicwidth="true" label="Object Name" name="object_name" />
+		<column dynamicwidth="true" label="Owner Name" name="owner_name" />
+		<column dynamicwidth="true" label="Creator Name" name="creator_name" />
+		<column label="Creation Date" name="creation_date" width="150" />
+	</scroll_list>
 	<button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="See Owner Profile..."
-	     label_selected="" left="10" mouse_opaque="true" name="button owner"
-	     width="150" tool_tip="See profile of the highlighted object's owner"/>
+	     label="See Owner Profile..." label_selected="" left="10"
+	     mouse_opaque="true" name="button owner"
+	     tool_tip="See profile of the highlighted object&apos;s owner" width="150" />
 	<button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="See Creator Profile..."
-	     label_selected="" left="170" mouse_opaque="true" name="button creator"
-	     width="150" tool_tip="See profile of the highlighted object's original creator"/>
+	     label="See Creator Profile..." label_selected="" left="170"
+	     mouse_opaque="true" name="button creator"
+	     tool_tip="See profile of the highlighted object&apos;s original creator"
+	     width="150" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
index b6a7932..20efaae 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater border="true" bottom="-298" can_close="true" can_drag_on_left="false"
      can_minimize="true" can_resize="true" default_tab_group="1"
      follows="left|top|right|bottom" height="297" label="(unknown)" left="1"
@@ -27,6 +28,9 @@
 	<string name="session_start_string">
 		Starting session with [NAME] please wait.
 	</string>
+	<string name="default_text_label">
+		Click here to instant message.
+	</string>
 	<button bottom="-40" follows="left|top" height="20" label="Profile..." left="4"
 	     name="profile_callee_btn" width="80" />
 	<button bottom="-40" follows="left|top" halign="center" height="20"
@@ -34,17 +38,15 @@
 	     label="Call" left_delta="85" name="start_call_btn" width="80" />
 	<button bottom="-40" follows="left|top" halign="right" height="20"
 	     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
-	     label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"
-	     pad_right="10"/>
+	     label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
+	     visible="false" width="80" />
 	<panel border="false" bottom="-40" follows="left|top|right" height="20"
 	     left_delta="77" name="speaker_controls" width="344">
-		<volume_slider bottom="0" follows="left|bottom" height="15" increment="0.05"
-		     initial_val="0.5" left="0" max_val="1.0" min_val="0.0"
-		     name="speaker_volume" width="80" />
-    	<button bottom_delta="0" height="20"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" left_delta="85"
-	     name="mute_btn" width="25" tool_tip="Mute voice"/>
+		<volume_slider bottom="0" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
+		     left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="80" />
+		<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
+		     image_unselected="icn_speaker_dark.tga" label="" left_delta="85"
+		     name="mute_btn" tool_tip="Mute voice" width="25" />
 	</panel>
 	<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
 	     bottom="28" embedded_items="false" enabled="false"
@@ -60,10 +62,10 @@
 	<button bottom="4" follows="right|bottom" font="SansSerif" halign="center" height="20"
 	     label="Send" left="432" mouse_opaque="true" name="send_btn"
 	     scale_image="true" width="60" />
-	<text hidden="true" name="live_help_dialog" wordwrap="false">
+	<string name="live_help_dialog">
 		*** Welcome to Help Request *** 
 Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 
 If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
 -=-=- Response times will vary, especially during peak times -=-=-
-	</text>
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
index eba2603..6eb4f9b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
@@ -1,30 +1,21 @@
-<!-- This is the _embedded_ instant message panel, not the floater that
-     contains all the instant messages.  See floater_im.xml.  JC -->
-<floater border="true"
-     bottom="-298"
-     can_close="true"
-     can_drag_on_left="false"
-     can_minimize="false"
-     can_resize="true"
-     enabled="true"
-     follows="left|top|right|bottom"
-     height="297"
-     hidden="false"
-     label="(unknown)"
-     left="1"
-     min_height="225"
-     min_width="265"
-     mouse_opaque="true"
-     name="im_floater"
-     rect_control=""
-     title="(unknown)"
-     width="501"
-     default_tab_group="1">
-
-	<string name="ringing">Joining Voice Chat...</string>
-	<string name="connected">Connected, click End Call to hang up</string>
-	<string name="hang_up">Left Voice Chat</string>
-	<string name="voice_icon">icn_voice-groupfocus.tga</string>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false"
+     can_minimize="false" can_resize="true" default_tab_group="1" enabled="true"
+     follows="left|top|right|bottom" height="297" label="(unknown)" left="1"
+     min_height="225" min_width="265" mouse_opaque="true" name="im_floater"
+     rect_control="" title="(unknown)" width="501">
+	<string name="ringing">
+		Joining Voice Chat...
+	</string>
+	<string name="connected">
+		Connected, click End Call to hang up
+	</string>
+	<string name="hang_up">
+		Left Voice Chat
+	</string>
+	<string name="voice_icon">
+		icn_voice-groupfocus.tga
+	</string>
 	<string name="title_string">
 		Instant Message with [NAME]
 	</string>
@@ -32,41 +23,51 @@
 		[NAME] is typing...
 	</string>
 	<string name="session_start_string">
-	    Starting session with [NAME] please wait.
+		Starting session with [NAME] please wait.
+	</string>
+	<string name="default_text_label">
+		Click here to instant message.
 	</string>
-	<layout_stack border="false" left="2" bottom="1" width="495" height="277" follows="left|top|right|bottom" orientation="horizontal" tab_group="1">
-    	<layout_panel border="false" name="im_contents_panel" min_width="115" left="0" bottom="0" width="495" height="295" follows="left|top|bottom|right" default_tab_group="1">
-			<button left="4" bottom="-24" height="20" width="80" label="Call" enabled="false" follows="left|top" name="start_call_btn" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" halign="center"/>
-			<button left_delta="0" bottom_delta="0" height="20" width="80" label="End Call" halign="right" follows="left|top" name="end_call_btn" visible="false" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" />
-    		<button left="460" right="493" bottom_delta="0" height="20" width="80" label="&lt; &lt;" label_selected="&gt; &gt;" follows="right|top" name="toggle_active_speakers_btn" visible="true" tool_tip="Click here to toggle list of active partipants in this IM session."/>
-			
+	<layout_stack border="false" bottom="1" follows="left|top|right|bottom" height="277" left="2"
+	     orientation="horizontal" tab_group="1" width="495">
+		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
+		     height="295" left="0" min_width="115" name="im_contents_panel" width="495">
+			<button bottom="-24" enabled="false" follows="left|top" halign="center" height="20"
+			     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
+			     label="Call" left="4" name="start_call_btn" width="80" />
+			<button bottom_delta="0" follows="left|top" halign="right" height="20"
+			     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
+			     label="End Call" left_delta="0" name="end_call_btn" visible="false"
+			     width="80" />
+			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
+			     label_selected="&gt; &gt;" left="460" name="toggle_active_speakers_btn"
+			     right="493"
+			     tool_tip="Click here to toggle list of active partipants in this IM session."
+			     visible="true" width="80" />
 			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-				bottom="-268" embedded_items="false" enabled="false"
-				follows="left|top|right|bottom" font="SansSerif" height="240"
-				hidden="false" left="4" max_length="2147483647" mouse_opaque="true"
-				name="im_history" text_color="ChatHistoryTextColor"
-				text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
+			     bottom="-268" embedded_items="false" enabled="false"
+			     follows="left|top|right|bottom" font="SansSerif" height="240" left="4"
+			     max_length="2147483647" mouse_opaque="true" name="im_history"
+			     text_color="ChatHistoryTextColor"
+			     text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="4"
-				enabled="true" follows="left|right|bottom" font="SansSerif"
-				handle_edit_keys_directly="false" height="20" hidden="false" left="4"
-				max_length="1022" mouse_opaque="true" name="chat_editor"
-				select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-				width="425" label="Click here to instant message" />
+			     enabled="true" follows="left|right|bottom" font="SansSerif"
+			     handle_edit_keys_directly="false" height="20"
+			     label="Click here to instant message" left="4" max_length="1022"
+			     mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
+			     select_on_focus="false" tab_group="1" width="425" />
 			<button bottom_delta="-1" enabled="true" follows="right|bottom" font="SansSerif"
-				halign="center" height="20" hidden="false" label="Send"
-				left="433" mouse_opaque="true" name="send_btn"
-				scale_image="true" width="60" />
+			     halign="center" height="20" label="Send" left="433" mouse_opaque="true"
+			     name="send_btn" scale_image="true" width="60" />
 		</layout_panel>
-			     
-   		<layout_panel filename="panel_speaker_controls.xml" auto_resize="false" bottom="0" can_resize="true" height="120" left="0"
-		     min_width="140" name="active_speakers_panel" top_delta="0" visible="false"
-		     width="140"/>
+		<layout_panel auto_resize="false" bottom="0" can_resize="true"
+		     filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"
+		     name="active_speakers_panel" top_delta="0" visible="false" width="140" />
 	</layout_stack>
-	<text hidden="true" name="live_help_dialog" wordwrap="false">
+	<string name="live_help_dialog">
 		*** Welcome to Help Request *** 
 Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 
 If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
 -=-=- Response times will vary, especially during peak times -=-=-
-	</text>
-
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
index 0c9fe38..131ec66 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
@@ -1,9 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"
      can_minimize="false" can_resize="true" default_tab_group="1" enabled="true"
-     follows="left|top|right|bottom" height="296" hidden="false"
-     label="(unknown)" left="1" min_height="200" min_width="360"
-     mouse_opaque="true" name="im_floater" rect_control="" title="(unknown)"
-     width="501">
+     follows="left|top|right|bottom" height="296" label="(unknown)" left="1"
+     min_height="200" min_width="360" mouse_opaque="true" name="im_floater"
+     rect_control="" title="(unknown)" width="501">
 	<string name="ringing">
 		Joining Voice Chat...
 	</string>
@@ -48,11 +48,12 @@
 			     name="group_info_btn" tab_group="0" width="80" />
 			<button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
 			     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-			     label="Join Call" left_delta="85" name="start_call_btn" width="80" pad_right="12"/>
-			<button bottom_delta="0" follows="left|top" height="20" halign="right"
-			     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
-			     label="End Call" left_delta="0" name="end_call_btn" visible="false" pad_right="12"
+			     label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
 			     width="80" />
+			<button bottom_delta="0" follows="left|top" halign="right" height="20"
+			     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
+			     label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
+			     visible="false" width="80" />
 			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
 			     label_selected="&gt; &gt;" left="140" name="toggle_active_speakers_btn"
 			     right="173"
@@ -60,23 +61,22 @@
 			     visible="true" width="70" />
 			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
 			     bottom="27" embedded_items="false" enabled="false"
-			     follows="left|top|right|bottom" font="SansSerif" hidden="false" left="4"
+			     follows="left|top|right|bottom" font="SansSerif" left="4"
 			     max_length="2147483647" mouse_opaque="true" name="im_history"
 			     text_color="ChatHistoryTextColor"
 			     text_readonly_color="ChatHistoryTextColor" top="102" width="170"
 			     word_wrap="true" />
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="4"
-			     enabled="true" follows="left|right|bottom" font="SansSerif"
-			     height="20" hidden="false"
-			     left="4" max_length="1022"
-			     mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
-			     select_on_focus="false" tab_group="1" width="105" />
+			     enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
+			     left="4" max_length="1022" mouse_opaque="true" name="chat_editor"
+			     select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
+			     width="105" />
 			<button bottom="3" enabled="true" follows="right|bottom" font="SansSerif"
-			     halign="center" height="20" hidden="false" label="Send" left="113"
-			     mouse_opaque="true" name="send_btn" scale_image="true" width="60" />
+			     halign="center" height="20" label="Send" left="113" mouse_opaque="true"
+			     name="send_btn" scale_image="true" width="60" />
 		</layout_panel>
-		<layout_panel filename="panel_speaker_controls.xml" auto_resize="false" bottom="0" can_resize="true" height="120" left="0"
-		     min_width="140" name="active_speakers_panel" top_delta="0" visible="false"
-		     width="140"/>
+		<layout_panel auto_resize="false" bottom="0" can_resize="true"
+		     filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"
+		     name="active_speakers_panel" top_delta="0" visible="false" width="140" />
 	</layout_stack>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
index c989742..68b1e36 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
@@ -1,161 +1,156 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-720" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="563" hidden="false" left="882" min_height="150"
-     min_width="240" mouse_opaque="true" name="Inventory"
-     rect_control="FloaterInventoryRect" title="Inventory" width="467">
-	<search_editor bottom="-50" follows="left|top|right" height="16" hidden="false" left="6"
-	     mouse_opaque="true" name="inventory search editor" width="455"
-	     label="Type here to search" />
-	<tab_container bottom_delta="-512" follows="left|top|right|bottom" height="508" hidden="false"
-	     left="2" mouse_opaque="false" name="inventory filter tabs"
-	     tab_position="top" width="463">
+     can_resize="true" height="563" left="882" min_height="150" min_width="240"
+     mouse_opaque="true" name="Inventory" rect_control="FloaterInventoryRect"
+     title="Inventory" width="467">
+	<search_editor bottom="-50" follows="left|top|right" height="16" label="Type here to search"
+	     left="6" mouse_opaque="true" name="inventory search editor" width="455" />
+	<tab_container bottom_delta="-512" follows="left|top|right|bottom" height="508" left="2"
+	     mouse_opaque="false" name="inventory filter tabs" tab_position="top"
+	     width="463">
 		<inventory_panel allow_multi_select="true" border="true" bottom="-507"
-		     follows="left|top|right|bottom" height="491" hidden="false"
-		     label="All Items" left="1" mouse_opaque="true" name="All Items"
-		     sort_order="InventorySortOrder" width="461" />
+		     follows="left|top|right|bottom" height="491" label="All Items" left="1"
+		     mouse_opaque="true" name="All Items" sort_order="InventorySortOrder"
+		     width="461" />
 		<inventory_panel allow_multi_select="true" border="true" bottom_delta="0"
-		     follows="left|top|right|bottom" height="491" hidden="false"
-		     label="Recent Items" left_delta="0" mouse_opaque="true" name="Recent Items"
+		     follows="left|top|right|bottom" height="491" label="Recent Items"
+		     left_delta="0" mouse_opaque="true" name="Recent Items"
 		     sort_order="RecentItemsSortOrder" width="461" />
 	</tab_container>
-	<menu_bar bottom="-34" drop_shadow="false" follows="left|top|right" height="18"
-	     hidden="false" left="2" mouse_opaque="false" name="Inventory Menu"
-	     opaque="false" width="461">
+	<menu_bar bottom="-34" drop_shadow="false" follows="left|top|right" height="18" left="2"
+	     mouse_opaque="false" name="Inventory Menu" opaque="false" width="461">
 		<menu bottom_delta="16" color="0, 0, 0, 1" drop_shadow="true" height="101"
-		     hidden="false" label="File" left="0" mouse_opaque="false" name="File"
-		     opaque="true" tear_off="true" width="128">
-			<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Open" left="0"
-			     mouse_opaque="true" name="Open" width="128">
+		     label="File" left="0" mouse_opaque="false" name="File" opaque="true"
+		     tear_off="true" width="128">
+			<menu_item_call bottom_delta="-18" height="18" label="Open" left="0" mouse_opaque="true"
+			     name="Open" width="128">
 				<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
 			</menu_item_call>
-			<menu_item_separator bottom_delta="-8" height="8" hidden="false" left="0" mouse_opaque="true"
-			     name="separator" width="128" />
-			<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Window" left="0"
-			     mouse_opaque="true" name="New Window" width="128">
+			<menu_item_separator bottom_delta="-8" height="8" left="0" mouse_opaque="true" name="separator"
+			     width="128" />
+			<menu_item_call bottom_delta="-18" height="18" label="New Window" left="0" mouse_opaque="true"
+			     name="New Window" width="128">
 				<on_click filter="" function="Inventory.NewWindow" userdata="" />
 			</menu_item_call>
-			<menu_item_separator bottom_delta="-8" height="8" hidden="false" left="0" mouse_opaque="true"
-			     name="separator2" width="128" />
-			<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Show Filters" left="0"
+			<menu_item_separator bottom_delta="-8" height="8" left="0" mouse_opaque="true" name="separator2"
+			     width="128" />
+			<menu_item_call bottom_delta="-18" height="18" label="Show Filters" left="0"
 			     mouse_opaque="true" name="Show Filters" width="128">
 				<on_click filter="" function="Inventory.ShowFilters" userdata="" />
 			</menu_item_call>
-			<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Reset Filters" left="0"
+			<menu_item_call bottom_delta="-18" height="18" label="Reset Filters" left="0"
 			     mouse_opaque="true" name="Reset Current" width="118">
 				<on_click filter="" function="Inventory.ResetFilter" userdata="" />
 			</menu_item_call>
-			<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Close All Folders"
-			     left="0" mouse_opaque="true" name="Close All Folders" width="128">
+			<menu_item_call bottom_delta="-18" height="18" label="Close All Folders" left="0"
+			     mouse_opaque="true" name="Close All Folders" width="128">
 				<on_click filter="" function="Inventory.CloseAllFolders" userdata="" />
 			</menu_item_call>
-			<menu_item_separator bottom_delta="-8" height="8" hidden="false" left="0" mouse_opaque="true"
-			     name="separator3" width="128" />
-			<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Empty Trash" left="0"
-			     mouse_opaque="true" name="Empty Trash" width="128">
+			<menu_item_separator bottom_delta="-8" height="8" left="0" mouse_opaque="true" name="separator3"
+			     width="128" />
+			<menu_item_call bottom_delta="-18" height="18" label="Empty Trash" left="0" mouse_opaque="true"
+			     name="Empty Trash" width="128">
 				<on_click filter="" function="Inventory.EmptyTrash" userdata="" />
 			</menu_item_call>
 		</menu>
 		<menu bottom_delta="80" color="0, 0, 0, 1" drop_shadow="true" height="121"
-		     hidden="false" label="Create" left="0" mouse_opaque="false" name="Create"
-		     opaque="true" tear_off="true" width="121">
-			<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Folder" left="0"
-			     mouse_opaque="true" name="New Folder" width="121">
+		     label="Create" left="0" mouse_opaque="false" name="Create" opaque="true"
+		     tear_off="true" width="121">
+			<menu_item_call bottom_delta="-18" height="18" label="New Folder" left="0" mouse_opaque="true"
+			     name="New Folder" width="121">
 				<on_click filter="" function="Inventory.DoCreate" userdata="category" />
 			</menu_item_call>
-			<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Script" left="0"
-			     mouse_opaque="true" name="New Script" width="121">
+			<menu_item_call bottom_delta="-18" height="18" label="New Script" left="0" mouse_opaque="true"
+			     name="New Script" width="121">
 				<on_click filter="" function="Inventory.DoCreate" userdata="lsl" />
 			</menu_item_call>
-			<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Note" left="0"
-			     mouse_opaque="true" name="New Note" width="121">
+			<menu_item_call bottom_delta="-18" height="18" label="New Note" left="0" mouse_opaque="true"
+			     name="New Note" width="121">
 				<on_click filter="" function="Inventory.DoCreate" userdata="notecard" />
 			</menu_item_call>
-			<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Gesture" left="0"
-			     mouse_opaque="true" name="New Gesture" width="121">
+			<menu_item_call bottom_delta="-18" height="18" label="New Gesture" left="0" mouse_opaque="true"
+			     name="New Gesture" width="121">
 				<on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
 			</menu_item_call>
-			<menu bottom_delta="-689" color="0, 0, 0, 1" drop_shadow="true" height="175"
-			     hidden="false" left="0" mouse_opaque="false" name="New Clothes"
-			     opaque="true" width="125">
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Shirt" left="0"
-				     mouse_opaque="true" name="New Shirt" width="125">
+			<menu bottom_delta="-689" color="0, 0, 0, 1" drop_shadow="true" height="175" left="0"
+			     mouse_opaque="false" name="New Clothes" opaque="true" width="125">
+				<menu_item_call bottom_delta="-18" height="18" label="New Shirt" left="0" mouse_opaque="true"
+				     name="New Shirt" width="125">
 					<on_click filter="" function="Inventory.DoCreate" userdata="shirt" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Pants" left="0"
-				     mouse_opaque="true" name="New Pants" width="125">
+				<menu_item_call bottom_delta="-18" height="18" label="New Pants" left="0" mouse_opaque="true"
+				     name="New Pants" width="125">
 					<on_click filter="" function="Inventory.DoCreate" userdata="pants" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Shoes" left="0"
-				     mouse_opaque="true" name="New Shoes" width="125">
+				<menu_item_call bottom_delta="-18" height="18" label="New Shoes" left="0" mouse_opaque="true"
+				     name="New Shoes" width="125">
 					<on_click filter="" function="Inventory.DoCreate" userdata="shoes" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Socks" left="0"
-				     mouse_opaque="true" name="New Socks" width="125">
+				<menu_item_call bottom_delta="-18" height="18" label="New Socks" left="0" mouse_opaque="true"
+				     name="New Socks" width="125">
 					<on_click filter="" function="Inventory.DoCreate" userdata="socks" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Jacket" left="0"
-				     mouse_opaque="true" name="New Jacket" width="125">
+				<menu_item_call bottom_delta="-18" height="18" label="New Jacket" left="0" mouse_opaque="true"
+				     name="New Jacket" width="125">
 					<on_click filter="" function="Inventory.DoCreate" userdata="jacket" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Skirt" left="0"
-				     mouse_opaque="true" name="New Skirt" width="125">
+				<menu_item_call bottom_delta="-18" height="18" label="New Skirt" left="0" mouse_opaque="true"
+				     name="New Skirt" width="125">
 					<on_click filter="" function="Inventory.DoCreate" userdata="skirt" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Gloves" left="0"
-				     mouse_opaque="true" name="New Gloves" width="125">
+				<menu_item_call bottom_delta="-18" height="18" label="New Gloves" left="0" mouse_opaque="true"
+				     name="New Gloves" width="125">
 					<on_click filter="" function="Inventory.DoCreate" userdata="gloves" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Undershirt" left="0"
+				<menu_item_call bottom_delta="-18" height="18" label="New Undershirt" left="0"
 				     mouse_opaque="true" name="New Undershirt" width="125">
 					<on_click filter="" function="Inventory.DoCreate" userdata="undershirt" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Underpants" left="0"
+				<menu_item_call bottom_delta="-18" height="18" label="New Underpants" left="0"
 				     mouse_opaque="true" name="New Underpants" width="125">
 					<on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
 				</menu_item_call>
 			</menu>
-			<menu bottom_delta="-599" color="0, 0, 0, 1" drop_shadow="true" height="85"
-			     hidden="false" left="0" mouse_opaque="false" name="New Body Parts"
-			     opaque="true" width="118">
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Shape" left="0"
-				     mouse_opaque="true" name="New Shape" width="118">
+			<menu bottom_delta="-599" color="0, 0, 0, 1" drop_shadow="true" height="85" left="0"
+			     mouse_opaque="false" name="New Body Parts" opaque="true" width="118">
+				<menu_item_call bottom_delta="-18" height="18" label="New Shape" left="0" mouse_opaque="true"
+				     name="New Shape" width="118">
 					<on_click filter="" function="Inventory.DoCreate" userdata="shape" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Skin" left="0"
-				     mouse_opaque="true" name="New Skin" width="118">
+				<menu_item_call bottom_delta="-18" height="18" label="New Skin" left="0" mouse_opaque="true"
+				     name="New Skin" width="118">
 					<on_click filter="" function="Inventory.DoCreate" userdata="skin" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Hair" left="0"
-				     mouse_opaque="true" name="New Hair" width="118">
+				<menu_item_call bottom_delta="-18" height="18" label="New Hair" left="0" mouse_opaque="true"
+				     name="New Hair" width="118">
 					<on_click filter="" function="Inventory.DoCreate" userdata="hair" />
 				</menu_item_call>
-				<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Eyes" left="0"
-				     mouse_opaque="true" name="New Eyes" width="118">
+				<menu_item_call bottom_delta="-18" height="18" label="New Eyes" left="0" mouse_opaque="true"
+				     name="New Eyes" width="118">
 					<on_click filter="" function="Inventory.DoCreate" userdata="eyes" />
 				</menu_item_call>
 			</menu>
 		</menu>
 		<menu bottom_delta="64" color="0, 0, 0, 1" drop_shadow="true" height="49"
-		     hidden="false" label="Sort" left="0" mouse_opaque="false" name="Sort"
-		     opaque="true" tear_off="true" width="118">
+		     label="Sort" left="0" mouse_opaque="false" name="Sort" opaque="true"
+		     tear_off="true" width="118">
 			<menu_item_check bottom_delta="-18" control_name="Inventory.SortByName" height="18"
-			     hidden="false" label="By Name" left="0" mouse_opaque="true" name="By Name"
-			     width="118">
+			     label="By Name" left="0" mouse_opaque="true" name="By Name" width="118">
 				<on_click filter="" function="Inventory.SetSortBy" userdata="name" />
 			</menu_item_check>
 			<menu_item_check bottom_delta="-18" control_name="Inventory.SortByDate" height="18"
-			     hidden="false" label="By Date" left="0" mouse_opaque="true" name="By Date"
-			     width="118">
+			     label="By Date" left="0" mouse_opaque="true" name="By Date" width="118">
 				<on_click filter="" function="Inventory.SetSortBy" userdata="date" />
 			</menu_item_check>
-			<menu_item_separator bottom_delta="-8" height="8" hidden="false" left="0" mouse_opaque="true"
-			     name="separator" width="118" />
+			<menu_item_separator bottom_delta="-8" height="8" left="0" mouse_opaque="true" name="separator"
+			     width="118" />
 			<menu_item_check bottom_delta="-18" control_name="Inventory.FoldersAlwaysByName" height="18"
-			     hidden="false" label="Folders Always By Name" left="0" mouse_opaque="true"
+			     label="Folders Always By Name" left="0" mouse_opaque="true"
 			     name="Folders Always By Name" width="118">
 				<on_click filter="" function="Inventory.SetSortBy" userdata="foldersalwaysbyname" />
 			</menu_item_check>
 			<menu_item_check bottom_delta="-18" control_name="Inventory.SystemFoldersToTop" height="18"
-			     hidden="false" label="System Folders To Top" left="0" mouse_opaque="true"
+			     label="System Folders To Top" left="0" mouse_opaque="true"
 			     name="System Folders To Top" width="118">
 				<on_click filter="" function="Inventory.SetSortBy" userdata="systemfolderstotop" />
 			</menu_item_check>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml
index b834821..ce0679c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml
@@ -3,8 +3,8 @@
      can_resize="false" height="320" min_height="100" min_width="100"
      name="item properties" rect_control="PropertiesRect"
      title="Inventory Item Properties" width="350">
-	<icon bottom="-21" follows="top|right" height="16" left="294" mouse_opaque="true"
-	     name="IconLocked" image_name="icon_lock.tga" width="16" />
+	<icon bottom="-21" follows="top|right" height="16" image_name="icon_lock.tga"
+	     left="294" mouse_opaque="true" name="IconLocked" width="16" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-35" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -167,8 +167,16 @@
 	     enabled="true" follows="left|top|right" font="SansSerifSmall" height="16"
 	     is_unicode="false" left_delta="56" max_length="25" mouse_opaque="true"
 	     name="EditPrice" width="242" />
-	<text hidden="true" name="unknown">(unknown)</text>
-	<text hidden="true" name="public">(public)</text>
-	<text hidden="true" name="you_can">You can:</text>
-	<text hidden="true" name="owner_can">Owner can:</text>
+	<string name="unknown">
+		(unknown)
+	</string>
+	<string name="public">
+		(public)
+	</string>
+	<string name="you_can">
+		You can:
+	</string>
+	<string name="owner_can">
+		Owner can:
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory_view_finder.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory_view_finder.xml
index b2daf11..9a9b8db 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory_view_finder.xml
@@ -1,115 +1,102 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-495" can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="false" can_tear_off="true" enabled="true" height="408"
-     hidden="false" left="457" min_height="408" min_width="160"
-     mouse_opaque="true" name="Inventory Finder" title="inventory_recent_items"
-     width="160">
+     left="457" min_height="408" min_width="160" mouse_opaque="true"
+     name="Inventory Finder" title="inventory_recent_items" width="160">
 	<icon bottom="-36" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_animation.tga" left="8"
-	     mouse_opaque="true" name="icon_animation" width="16" />
+	     image_name="inv_item_animation.tga" left="8" mouse_opaque="true"
+	     name="icon_animation" width="16" />
 	<check_box bottom="-36" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Animation"
-	     left="26" mouse_opaque="true" name="check_animation" radio_style="false"
-	     width="126" />
+	     height="16" initial_value="false" label="Animation" left="26"
+	     mouse_opaque="true" name="check_animation" radio_style="false" width="126" />
 	<icon bottom="-56" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_callingcard_online.tga" left="8"
-	     mouse_opaque="true" name="icon_calling_card" width="16" />
+	     image_name="inv_item_callingcard_online.tga" left="8" mouse_opaque="true"
+	     name="icon_calling_card" width="16" />
 	<check_box bottom="-56" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Calling Cards"
-	     left="26" mouse_opaque="true" name="check_calling_card" radio_style="false"
+	     height="16" initial_value="false" label="Calling Cards" left="26"
+	     mouse_opaque="true" name="check_calling_card" radio_style="false"
 	     width="126" />
 	<icon bottom="-76" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_shirt.tga" left="8" mouse_opaque="true"
+	     image_name="inv_item_shirt.tga" left="8" mouse_opaque="true"
 	     name="icon_clothing" width="16" />
 	<check_box bottom="-76" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Clothing" left="26"
+	     height="16" initial_value="false" label="Clothing" left="26"
 	     mouse_opaque="true" name="check_clothing" radio_style="false" width="126" />
 	<icon bottom="-96" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_gesture.tga" left="8"
-	     mouse_opaque="true" name="icon_gesture" width="16" />
+	     image_name="inv_item_gesture.tga" left="8" mouse_opaque="true"
+	     name="icon_gesture" width="16" />
 	<check_box bottom="-96" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Gestures" left="26"
+	     height="16" initial_value="false" label="Gestures" left="26"
 	     mouse_opaque="true" name="check_gesture" radio_style="false" width="126" />
 	<icon bottom="-116" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_landmark_visited.tga" left="8"
-	     mouse_opaque="true" name="icon_landmark" width="16" />
+	     image_name="inv_item_landmark_visited.tga" left="8" mouse_opaque="true"
+	     name="icon_landmark" width="16" />
 	<check_box bottom="-116" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Landmarks"
-	     left="26" mouse_opaque="true" name="check_landmark" radio_style="false"
-	     width="126" />
+	     height="16" initial_value="false" label="Landmarks" left="26"
+	     mouse_opaque="true" name="check_landmark" radio_style="false" width="126" />
 	<icon bottom="-136" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_notecard.tga" left="8"
-	     mouse_opaque="true" name="icon_notecard" width="16" />
+	     image_name="inv_item_notecard.tga" left="8" mouse_opaque="true"
+	     name="icon_notecard" width="16" />
 	<check_box bottom="-136" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Notecards"
-	     left="26" mouse_opaque="true" name="check_notecard" radio_style="false"
-	     width="126" />
+	     height="16" initial_value="false" label="Notecards" left="26"
+	     mouse_opaque="true" name="check_notecard" radio_style="false" width="126" />
 	<icon bottom="-156" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_object.tga" left="8"
-	     mouse_opaque="true" name="icon_object" width="16" />
+	     image_name="inv_item_object.tga" left="8" mouse_opaque="true"
+	     name="icon_object" width="16" />
 	<check_box bottom="-156" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Objects" left="26"
+	     height="16" initial_value="false" label="Objects" left="26"
 	     mouse_opaque="true" name="check_object" radio_style="false" width="126" />
 	<icon bottom="-176" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_script.tga" left="8"
-	     mouse_opaque="true" name="icon_script" width="16" />
+	     image_name="inv_item_script.tga" left="8" mouse_opaque="true"
+	     name="icon_script" width="16" />
 	<check_box bottom="-176" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Scripts" left="26"
+	     height="16" initial_value="false" label="Scripts" left="26"
 	     mouse_opaque="true" name="check_script" radio_style="false" width="126" />
 	<icon bottom="-196" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_sound.tga" left="8" mouse_opaque="true"
+	     image_name="inv_item_sound.tga" left="8" mouse_opaque="true"
 	     name="icon_sound" width="16" />
 	<check_box bottom="-196" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Sounds" left="26"
+	     height="16" initial_value="false" label="Sounds" left="26"
 	     mouse_opaque="true" name="check_sound" radio_style="false" width="126" />
 	<icon bottom="-216" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_texture.tga" left="8"
-	     mouse_opaque="true" name="icon_texture" width="16" />
+	     image_name="inv_item_texture.tga" left="8" mouse_opaque="true"
+	     name="icon_texture" width="16" />
 	<check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Textures" left="26"
+	     height="16" initial_value="false" label="Textures" left="26"
 	     mouse_opaque="true" name="check_texture" radio_style="false" width="126" />
 	<icon bottom="-236" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_snapshot.tga" left="8"
-	     mouse_opaque="true" name="icon_snapshot" width="16" />
+	     image_name="inv_item_snapshot.tga" left="8" mouse_opaque="true"
+	     name="icon_snapshot" width="16" />
 	<check_box bottom="-236" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Snapshots"
-	     left="26" mouse_opaque="true" name="check_snapshot" radio_style="false"
-	     width="126" />
+	     height="16" initial_value="false" label="Snapshots" left="26"
+	     mouse_opaque="true" name="check_snapshot" radio_style="false" width="126" />
 	<button bottom="-260" enabled="true" follows="left|top" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="All" label_selected="All"
-	     left="8" mouse_opaque="true" name="All" scale_image="true" width="100" />
+	     halign="center" height="20" label="All" label_selected="All" left="8"
+	     mouse_opaque="true" name="All" scale_image="true" width="100" />
 	<button bottom="-284" enabled="true" follows="left|top" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="None"
-	     label_selected="None" left="8" mouse_opaque="true" name="None"
-	     scale_image="true" width="100" />
+	     halign="center" height="20" label="None" label_selected="None" left="8"
+	     mouse_opaque="true" name="None" scale_image="true" width="100" />
 	<check_box bottom="-304" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false"
-	     label="Always show folders" left="8" mouse_opaque="true"
-	     name="check_show_empty" radio_style="false" width="144" />
+	     height="16" initial_value="false" label="Always show folders" left="8"
+	     mouse_opaque="true" name="check_show_empty" radio_style="false" width="144" />
 	<check_box bottom="-324" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Since Logoff"
-	     left="8" mouse_opaque="true" name="check_since_logoff" radio_style="false"
+	     height="16" initial_value="false" label="Since Logoff" left="8"
+	     mouse_opaque="true" name="check_since_logoff" radio_style="false"
 	     width="144" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-336" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="center" height="12" hidden="false"
-	     left="8" mouse_opaque="true" name="- OR -" v_pad="0" width="144">
+	     font="SansSerifSmall" h_pad="0" halign="center" height="12" left="8"
+	     mouse_opaque="true" name="- OR -" v_pad="0" width="144">
 		- OR -
 	</text>
-	<spinner bottom="-356" enabled="true" follows="left|top" height="16" hidden="false"
-	     increment="1" initial_val="0" label="Hours Ago" label_width="64" left="8"
+	<spinner bottom="-356" enabled="true" follows="left|top" height="16" increment="1"
+	     initial_val="0" label="Hours Ago" label_width="64" left="8"
 	     max_val="240000" min_val="0" mouse_opaque="true" name="spin_hours_ago"
 	     width="144" />
-	<spinner bottom="-376" enabled="true" follows="left|top" height="16" hidden="false"
-	     increment="1" initial_val="0" label="Days Ago" label_width="64" left="8"
-	     max_val="10000" min_val="0" mouse_opaque="true" name="spin_days_ago"
-	     width="144" />
-        <!--spinner bottom="-376" enabled="true" follows="left|top" height="16" hidden="false"
-	     increment="1" initial_val="0" label="Days Ago" label_width="64" left="8"
-	     max_val="10000" min_val="0" mouse_opaque="true" name="spin_days_ago"
-	     width="144" /-->
+	<spinner bottom="-376" enabled="true" follows="left|top" height="16" increment="1"
+	     initial_val="0" label="Days Ago" label_width="64" left="8" max_val="10000"
+	     min_val="0" mouse_opaque="true" name="spin_days_ago" width="144" />
 	<button bottom="-400" enabled="true" follows="top|right" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Close"
-	     label_selected="Close" right="-6" mouse_opaque="true" name="Close"
-	     scale_image="true" width="76" />
+	     halign="center" height="20" label="Close" label_selected="Close"
+	     mouse_opaque="true" name="Close" right="-6" scale_image="true" width="76" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml b/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
index 77fa57e..8d94ae1 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
@@ -1,57 +1,106 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-297" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="right" height="500" left="298" min_height="151"
+     can_resize="false" follows="right" height="580" left="298" min_height="151"
      min_width="240" mouse_opaque="true" name="build options floater"
      rect_control="FloaterJoystickRect" title="Flycam Options" width="400">
-     
-     <text bottom="-40" left="14" name="x-axis">X-Axis</text>
-     <text bottom="-40" left="142" name="y-axis">Y-Axis</text>
-     <text bottom="-40" left="270" name="z-axis">Z-Axis</text>
-     
-     <spinner bottom="-61" left="14" width="120" label_width="64" control_name="FlycamAxis1" name="FlycamAxis1" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-     <spinner bottom="-61" left="142" width="120" label_width="64" control_name="FlycamAxis2" name="FlycamAxis2" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-	 <spinner bottom="-61" left="270" width="120" label_width="64" control_name="FlycamAxis0" name="FlycamAxis0" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>   
-	 
-	 <spinner bottom="-82" left="14" width="120" label_width="64" control_name="FlycamAxisScale1" name="FlycamAxisScale1" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-     <spinner bottom="-82" left="142" width="120" label_width="64" control_name="FlycamAxisScale2" name="FlycamAxisScale2" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	 <spinner bottom="-82" left="270" width="120" label_width="64" control_name="FlycamAxisScale0" name="FlycamAxisScale0" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>   
-	
-	 <spinner bottom="-103" left="14" width="120" label_width="64" control_name="FlycamAxisDeadZone1" name="FlycamAxisDeadZone1" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-     <spinner bottom="-103" left="142" width="120" label_width="64" control_name="FlycamAxisDeadZone2" name="FlycamAxisDeadZone2" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	 <spinner bottom="-103" left="270" width="120" label_width="64" control_name="FlycamAxisDeadZone0" name="FlycamAxisDeadZone0" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>   
-	
-	 <text bottom="-132" left="14" name="yaw">Yaw</text>
-     <text bottom="-132" left="142" name="pitch">Pitch</text>
-     <text bottom="-132" left="270" name="roll">Roll</text>
-     
-	 <spinner bottom="-153" left="14" width="120" label_width="64" control_name="FlycamAxis5" name="FlycamAxis5" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-     <spinner bottom="-153" left="142" width="120" label_width="64" control_name="FlycamAxis4" name="FlycamAxis4" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-	 <spinner bottom="-153" left="270" width="120" label_width="64" control_name="FlycamAxis3" name="FlycamAxis3" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>   
-	 
-	 <spinner bottom="-174" left="14" width="120" label_width="64" control_name="FlycamAxisScale5" name="FlycamAxisScale5" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-     <spinner bottom="-174" left="142" width="120" label_width="64" control_name="FlycamAxisScale4" name="FlycamAxisScale4" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	 <spinner bottom="-174" left="270" width="120" label_width="64" control_name="FlycamAxisScale3" name="FlycamAxisScale3" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>   
-	
-	 <spinner bottom="-195" left="14" width="120" label_width="64" control_name="FlycamAxisDeadZone5" name="FlycamAxisDeadZone5" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-     <spinner bottom="-195" left="142" width="120" label_width="64" control_name="FlycamAxisDeadZone4" name="FlycamAxisDeadZone4" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	 <spinner bottom="-195" left="270" width="120" label_width="64" control_name="FlycamAxisDeadZone3" name="FlycamAxisDeadZone3" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>   
-	    
-	 <text name="ZoomLabel" bottom="-224" left="14">Zoom</text>
-	<spinner bottom="-245" left="14" width="120" label_width="64" control_name="FlycamAxis6" name="FlycamAxis6" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>	     
-	<spinner bottom="-266" left="14" width="120" label_width="64" control_name="FlycamAxisScale6" name="FlycamAxisScale6" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	 <spinner bottom="-287" left="14" width="120" label_width="64" control_name="FlycamAxisDeadZone6" name="FlycamAxisDeadZone6" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	 <check_box bottom_delta="-21" control_name="FlycamZoomDirect" label="Direct Zoom" />
-	 
-	 <slider bottom_delta="-29" can_edit_text="false" control_name="FlycamFeathering"
+	<text bottom="-40" left="14" name="x-axis">
+		X-Axis
+	</text>
+	<text bottom="-40" left="142" name="y-axis">
+		Y-Axis
+	</text>
+	<text bottom="-40" left="270" name="z-axis">
+		Z-Axis
+	</text>
+	<spinner bottom="-61" control_name="FlycamAxis1" decimal_digits="0" increment="1"
+	     label="Mapping" label_width="64" left="14" max_val="7" min_val="-1"
+	     name="FlycamAxis1" width="120" />
+	<spinner bottom="-61" control_name="FlycamAxis2" decimal_digits="0" increment="1"
+	     label="Mapping" label_width="64" left="142" max_val="7" min_val="-1"
+	     name="FlycamAxis2" width="120" />
+	<spinner bottom="-61" control_name="FlycamAxis0" decimal_digits="0" increment="1"
+	     label="Mapping" label_width="64" left="270" max_val="7" min_val="-1"
+	     name="FlycamAxis0" width="120" />
+	<spinner bottom="-82" control_name="FlycamAxisScale1" decimal_digits="2" increment="0.1"
+	     label="Scale" label_width="64" left="14" max_val="1024" min_val="-1024"
+	     name="FlycamAxisScale1" width="120" />
+	<spinner bottom="-82" control_name="FlycamAxisScale2" decimal_digits="2" increment="0.1"
+	     label="Scale" label_width="64" left="142" max_val="1024" min_val="-1024"
+	     name="FlycamAxisScale2" width="120" />
+	<spinner bottom="-82" control_name="FlycamAxisScale0" decimal_digits="2" increment="0.1"
+	     label="Scale" label_width="64" left="270" max_val="1024" min_val="-1024"
+	     name="FlycamAxisScale0" width="120" />
+	<spinner bottom="-103" control_name="FlycamAxisDeadZone1" decimal_digits="2"
+	     increment="0.01" label="Dead Zone" label_width="64" left="14" max_val="1"
+	     min_val="0" name="FlycamAxisDeadZone1" width="120" />
+	<spinner bottom="-103" control_name="FlycamAxisDeadZone2" decimal_digits="2"
+	     increment="0.01" label="Dead Zone" label_width="64" left="142" max_val="1"
+	     min_val="0" name="FlycamAxisDeadZone2" width="120" />
+	<spinner bottom="-103" control_name="FlycamAxisDeadZone0" decimal_digits="2"
+	     increment="0.01" label="Dead Zone" label_width="64" left="270" max_val="1"
+	     min_val="0" name="FlycamAxisDeadZone0" width="120" />
+	<text bottom="-132" left="14" name="yaw">
+		Yaw
+	</text>
+	<text bottom="-132" left="142" name="pitch">
+		Pitch
+	</text>
+	<text bottom="-132" left="270" name="roll">
+		Roll
+	</text>
+	<spinner bottom="-153" control_name="FlycamAxis5" decimal_digits="0" increment="1"
+	     label="Mapping" label_width="64" left="14" max_val="7" min_val="-1"
+	     name="FlycamAxis5" width="120" />
+	<spinner bottom="-153" control_name="FlycamAxis4" decimal_digits="0" increment="1"
+	     label="Mapping" label_width="64" left="142" max_val="7" min_val="-1"
+	     name="FlycamAxis4" width="120" />
+	<spinner bottom="-153" control_name="FlycamAxis3" decimal_digits="0" increment="1"
+	     label="Mapping" label_width="64" left="270" max_val="7" min_val="-1"
+	     name="FlycamAxis3" width="120" />
+	<spinner bottom="-174" control_name="FlycamAxisScale5" decimal_digits="2"
+	     increment="0.1" label="Scale" label_width="64" left="14" max_val="1024"
+	     min_val="-1024" name="FlycamAxisScale5" width="120" />
+	<spinner bottom="-174" control_name="FlycamAxisScale4" decimal_digits="2"
+	     increment="0.1" label="Scale" label_width="64" left="142" max_val="1024"
+	     min_val="-1024" name="FlycamAxisScale4" width="120" />
+	<spinner bottom="-174" control_name="FlycamAxisScale3" decimal_digits="2"
+	     increment="0.1" label="Scale" label_width="64" left="270" max_val="1024"
+	     min_val="-1024" name="FlycamAxisScale3" width="120" />
+	<spinner bottom="-195" control_name="FlycamAxisDeadZone5" decimal_digits="2"
+	     increment="0.01" label="Dead Zone" label_width="64" left="14" max_val="1"
+	     min_val="0" name="FlycamAxisDeadZone5" width="120" />
+	<spinner bottom="-195" control_name="FlycamAxisDeadZone4" decimal_digits="2"
+	     increment="0.01" label="Dead Zone" label_width="64" left="142" max_val="1"
+	     min_val="0" name="FlycamAxisDeadZone4" width="120" />
+	<spinner bottom="-195" control_name="FlycamAxisDeadZone3" decimal_digits="2"
+	     increment="0.01" label="Dead Zone" label_width="64" left="270" max_val="1"
+	     min_val="0" name="FlycamAxisDeadZone3" width="120" />
+	<text bottom="-224" left="14" name="ZoomLabel">
+		Zoom
+	</text>
+	<spinner bottom="-245" control_name="FlycamAxis6" decimal_digits="0" increment="1"
+	     label="Mapping" label_width="64" left="14" max_val="7" min_val="-1"
+	     name="FlycamAxis6" width="120" />
+	<spinner bottom="-266" control_name="FlycamAxisScale6" decimal_digits="2"
+	     increment="0.1" label="Scale" label_width="64" left="14" max_val="1024"
+	     min_val="-1024" name="FlycamAxisScale6" width="120" />
+	<spinner bottom="-287" control_name="FlycamAxisDeadZone6" decimal_digits="2"
+	     increment="0.01" label="Dead Zone" label_width="64" left="14" max_val="1"
+	     min_val="0" name="FlycamAxisDeadZone6" width="120" />
+	<check_box bottom_delta="-21" control_name="FlycamZoomDirect" label="Direct Zoom" />
+	<slider bottom_delta="-29" can_edit_text="false" control_name="FlycamFeathering"
 	     decimal_digits="0" follows="left" height="16" increment="1"
 	     initial_val="0.7" label="Feathering" left="14" max_val="32" min_val="1"
 	     mouse_opaque="true" name="FlycamFeathering" show_text="false" value="0.7"
 	     width="128" />
-	   
-	<check_box bottom_delta="-21" control_name="FlycamAutoLeveling" name="FlycamAutoLeveling" label="Auto Level" />
-	<check_box bottom_delta="-21" control_name="FlycamAbsolute" name="FlycamAbsolute" label="3D Cursor" />
-	
-	<text hidden="true" name="JoystickMonitor">Joystick Monitor</text>
-	<text hidden="true" name="Axis">Axis [NUM]</text>
-	
+	<check_box bottom_delta="-21" control_name="FlycamAutoLeveling" label="Auto Level"
+	     name="FlycamAutoLeveling" />
+	<check_box bottom_delta="-21" control_name="FlycamAbsolute" label="3D Cursor"
+	     name="FlycamAbsolute" />
+	<string name="JoystickMonitor">
+		Joystick Monitor
+	</string>
+	<string name="Axis">
+		Axis [NUM]
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
index de4dd6c..905d795 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
@@ -1,426 +1,199 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater 
-	can_close="true" 
-	can_drag_on_left="false" 
-	can_minimize="true"
-    can_resize="false" 
-    height="150" 
-    width="370"
-    name="floater_lagmeter" 
-    title="Lag Meter"
-    rect_control="FloaterLagMeter" >
-    
-     	<button 
-     		bottom="-40" 
-     		enabled="true" 
-     		follows="top|left" 
-     		font="SansSerif"
-			halign="center"
-			hidden="false"
-			image_selected="lag_status_good.tga"
-			image_unselected="lag_status_good.tga" 
-			label="" 
-			label_selected=""
-			left="8" 
-			mouse_opaque="true" 
-			name="client_lagmeter" 
-			scale_image="true"
-			tool_tip="Client lag status" 
-			tab_stop="false"
-			height="16" 
-			width="16" />
-		
-		<text 
-			bg_visible="false" 
-			border_drop_shadow_visible="false" 
-			border_visible="false"
-			bottom="-40" 
-			drop_shadow_visible="true" 
-			follows="left|top" 
-			font="SansSerif"
-			halign="left" 
-			left="27" 
-			mouse_opaque="true"
-			name="client" 
-			v_pad="0" 
-			h_pad="0" 
-			width="128"
-			height="16" >
-				Client:
-			</text>
-			
-		<text 
-			bg_visible="false" 
-			border_drop_shadow_visible="false" 
-			border_visible="false"
-			bottom="-40" 
-			drop_shadow_visible="true" 
-			follows="left|top" 
-			font="SansSerif"
-			halign="left" 
-			left="110" 
-			right="-10"
-			mouse_opaque="true"
-			name="client_text" 
-			v_pad="0" 
-			h_pad="0" 
-			height="16" >
-				Normal
-			</text>
-
-<!--			
-		<button 
-			bottom="-56" 
-			follows="left|top" 
-			font="SansSerif" 
-			halign="center"
-			height="18" 
-			label="?" 
-			right="-10"
-			mouse_opaque="true" 
-			name="client_help"
-			width="18"
-			help_url="http://secondlife.com/support/" />
--->
-			
-		<text 
-			bg_visible="false" 
-			border_drop_shadow_visible="false" 
-			border_visible="false"
-			bottom="-56"
-			drop_shadow_visible="true" 
-			follows="left|top" 
-			font="SansSerifSmall"
-			halign="left" 
-			left="40" 
-			mouse_opaque="true"
-			name="client_lag_cause" 
-			v_pad="0" 
-			h_pad="0" 
-			right="-32"
-			height="16" >
-			</text>
-			
-		<button  
-			bottom="-80"
-     		enabled="true" 
-     		follows="top|left" 
-     		font="SansSerif"
-			halign="center"
-			hidden="false"
-			image_selected="lag_status_good.tga" 
-			image_unselected="lag_status_good.tga" 
-			label="" 
-			label_selected=""
-			left="8" 
-			mouse_opaque="true" 
-			name="network_lagmeter" 
-			scale_image="true"
-			tool_tip="Network lag status" 
-			tab_stop="false"
-			height="16" 
-			width="16" />
-			
-		<text
-			bg_visible="false" 
-			border_drop_shadow_visible="false" 
-			border_visible="false"
-			bottom="-80" 
-			drop_shadow_visible="true" 
-			follows="left|top" 
-			font="SansSerif"
-			halign="left" 
-			left="27" 
-			mouse_opaque="true"
-			name="network" 
-			v_pad="0" 
-			h_pad="0" 
-			width="128"
-			height="16" >
-				Network:
-			</text>
-			
-		<text 
-			bg_visible="false" 
-			border_drop_shadow_visible="false" 
-			border_visible="false"
-			bottom="-80" 
-			drop_shadow_visible="true" 
-			follows="left|top" 
-			font="SansSerif"
-			halign="left" 
-			left="110" 
-			right="-10"
-			mouse_opaque="true"
-			name="network_text" 
-			v_pad="0" 
-			h_pad="0" 
-			height="16" >
-				Normal
-			</text>
-
-<!--			
-		<button 
-			bottom_delta="-16" 
-			follows="left|top" 
-			font="SansSerif" 
-			halign="center"
-			height="18" 
-			label="?" 
-			right="-10"
-			mouse_opaque="true" 
-			name="network_help"
-			width="18"
-			help_url="http://secondlife.com/support/" />
--->
-
-		<text 
-			bg_visible="false" 
-			border_drop_shadow_visible="false" 
-			border_visible="false"
-			bottom="-96"
-			drop_shadow_visible="true" 
-			follows="left|top" 
-			font="SansSerifSmall"
-			halign="left" 
-			left="40" 
-			mouse_opaque="true"
-			name="network_lag_cause" 
-			v_pad="0" 
-			h_pad="0" 
-			right="-32"
-			height="16" >
-			</text>
-			
-		<button 
-			bottom="-120"
-     		enabled="true" 
-     		follows="top|left"  
-     		font="SansSerif"
-			halign="center"
-			hidden="false"
-			image_selected="lag_status_good.tga" 
-			image_unselected="lag_status_good.tga" 
-			label="" 
-			label_selected=""
-			left="8" 
-			mouse_opaque="true" 
-			name="server_lagmeter" 
-			scale_image="true"
-			tool_tip="Server lag status" 
-			tab_stop="false"
-			height="16" 
-			width="16" />
-			
-		<text
-			bg_visible="false" 
-			border_drop_shadow_visible="false" 
-			border_visible="false"
-			bottom="-120" 
-			drop_shadow_visible="true" 
-			follows="left|top" 
-			font="SansSerif"
-			halign="left" 
-			left="27" 
-			mouse_opaque="true"
-			name="server" 
-			v_pad="0" 
-			h_pad="0" 
-			width="60"
-			height="16" >
-				Server:
-			</text>
-			
-		<text 
-			bg_visible="false" 
-			border_drop_shadow_visible="false" 
-			border_visible="false"
-			bottom="-120" 
-			drop_shadow_visible="true" 
-			follows="left|top" 
-			font="SansSerif"
-			halign="left" 
-			left="85" 
-			right="-10"
-			mouse_opaque="true"
-			name="server_text" 
-			v_pad="0" 
-			h_pad="0" 
-			height="16" >
-				Normal
-			</text>
-
-		<text 
-			bg_visible="false" 
-			border_drop_shadow_visible="false" 
-			border_visible="false"
-			bottom="-136"
-			drop_shadow_visible="true" 
-			follows="left|top" 
-			font="SansSerifSmall"
-			halign="left" 
-			left="40" 
-			mouse_opaque="true"
-			name="server_lag_cause" 
-			v_pad="0" 
-			h_pad="0" 
-			right="-32"
-			height="16" >
-			</text>
-
-  <button
-    bottom="5"
-    follows="left|top"
-    font="SansSerif"
-    halign="center"
-    height="18"
-    label="?"
-    right="-10"
-    mouse_opaque="true"
-    name="server_help"
-    width="18"
-    help_url="http://secondlife.com/support" />
-
-  <button 
-			bottom="5" 
-			follows="left|top" 
-			font="SansSerif" 
-			halign="center"
-			height="20" 
-			label="&gt;&gt;" 
-			left="5"
-			mouse_opaque="true" 
-			name="minimize"
-			width="25" />
-			
-		<text hidden="true" name="max_title_msg">
-			Lag Meter
-		</text>
-		<text hidden="true" name="max_width_px">
-			360
-		</text>
-		<text hidden="true" name="min_title_msg">
-			Lag
-		</text>
-		<text hidden="true" name="min_width_px">
-			90
-		</text>
-			
-		<text hidden="true" name="client_text_msg">
-			Client
-		</text>
-		<text hidden="true" name="client_frame_rate_critical_fps">
-			10
-		</text>
-		<text hidden="true" name="client_frame_rate_warning_fps">
-			15
-		</text>
-		<text hidden="true" name="client_frame_time_window_bg_msg">
-			Normal, window in background
-		</text>
-		<text hidden="true" name="client_frame_time_critical_msg">
-			Client frame rate below [CLIENT_FRAME_RATE_CRITICAL]
-		</text>
-		<text hidden="true" name="client_frame_time_warning_msg">
-			Client frame rate between [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING]
-		</text>
-		<text hidden="true" name="client_frame_time_normal_msg">
-			Normal
-		</text>
-		<text hidden="true" name="client_draw_distance_cause_msg">
-			Possible cause: Draw distance set too high
-		</text>
-		<text hidden="true" name="client_texture_loading_cause_msg">
-			Possible cause: Images loading
-		</text>
-		<text hidden="true" name="client_texture_memory_cause_msg">
-			Possible cause: Too many images in memory
-		</text>
-		<text hidden="true" name="client_complex_objects_cause_msg">
-			Possible cause: Too many complex objects in scene
-		</text>
-		
-		<text hidden="true" name="network_text_msg">
-			Network
-		</text>
-		<text hidden="true" name="network_packet_loss_critical_pct">
-			10
-		</text>
-		<text hidden="true" name="network_packet_loss_warning_pct">
-			5
-		</text>
-		<text hidden="true" name="network_packet_loss_critical_msg">
-			Connection is dropping over [NETWORK_PACKET_LOSS_CRITICAL]% of packets
-		</text>
-		<text hidden="true" name="network_packet_loss_warning_msg">
-			Connection is dropping [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% of packets
-		</text>
-		<text hidden="true" name="network_performance_normal_msg">
-			Normal
-		</text>
-		<text hidden="true" name="network_ping_critical_ms">
-			600
- 		</text>
-		<text hidden="true" name="network_ping_warning_ms">
-			300
-		</text>
-		<text hidden="true" name="network_ping_critical_msg">
-			Connection ping time is over [NETWORK_PING_CRITICAL] ms
-		</text>
-		<text hidden="true" name="network_ping_warning_msg">
-			Connection ping time is [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-		</text>
-		<text hidden="true" name="network_packet_loss_cause_msg">
-			Possible bad connection or 'Bandwidth' pref too high.
-		</text>
-		<text hidden="true" name="network_ping_cause_msg">
-			Possible bad connection or file-sharing app.
-		</text>
-
-		
-		<text hidden="true" name="server_text_msg">
-			Server
-		</text>
-		<text hidden="true" name="server_frame_rate_critical_fps">
-			20
-		</text>
-		<text hidden="true" name="server_frame_rate_warning_fps">
-			30
-		</text>
-		<text hidden="true" name="server_single_process_max_time_ms">
-			20
-		</text>
-		<text hidden="true" name="server_frame_time_critical_msg">
-			Simulator framerate below [SERVER_FRAME_RATE_CRITICAL]
-		</text>
-		<text hidden="true" name="server_frame_time_warning_msg">
-			Simulator framerate between [SERVER_FRAME_RATE_CRITICAL] and [SERVER_FRAME_RATE_WARNING]
-		</text>
-		<text hidden="true" name="server_frame_time_normal_msg">
-			Normal
-		</text>
-		<text hidden="true" name="server_physics_cause_msg">
-			Possible Cause: Too many physical objects
-		</text>
-		<text hidden="true" name="server_scripts_cause_msg">
-			Possible Cause: Too many scripted objects
-		</text>
-		<text hidden="true" name="server_net_cause_msg">
-			Possible Cause: Too much network traffic
-		</text>
-		<text hidden="true" name="server_agent_cause_msg">
-			Possible Cause: Too many moving people in region
-		</text>
-		<text hidden="true" name="server_images_cause_msg">
-			Possible Cause: Too many image calculations
-		</text>
-		<text hidden="true" name="server_generic_cause_msg">
-			Possible Cause: Simulator load too heavy
-		</text>
-		<text hidden="true" name="smaller_label">
-      &gt;&gt;
-    </text>
-    <text hidden="true" name="bigger_label">
-      &lt;&lt;
-    </text>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="150" name="floater_lagmeter"
+     rect_control="FloaterLagMeter" title="Lag Meter" width="370">
+	<button bottom="-40" enabled="true" follows="top|left" font="SansSerif" halign="center"
+	     height="16" image_selected="lag_status_good.tga"
+	     image_unselected="lag_status_good.tga" label="" label_selected="" left="8"
+	     mouse_opaque="true" name="client_lagmeter" scale_image="true"
+	     tab_stop="false" tool_tip="Client lag status" width="16" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-40" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+	     h_pad="0" halign="left" height="16" left="27" mouse_opaque="true"
+	     name="client" v_pad="0" width="128">
+		Client:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-40" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+	     h_pad="0" halign="left" height="16" left="110" mouse_opaque="true"
+	     name="client_text" right="-10" v_pad="0">
+		Normal
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-56" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+	     mouse_opaque="true" name="client_lag_cause" right="-32" v_pad="0" />
+	<button bottom="-80" enabled="true" follows="top|left" font="SansSerif" halign="center"
+	     height="16" image_selected="lag_status_good.tga"
+	     image_unselected="lag_status_good.tga" label="" label_selected="" left="8"
+	     mouse_opaque="true" name="network_lagmeter" scale_image="true"
+	     tab_stop="false" tool_tip="Network lag status" width="16" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-80" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+	     h_pad="0" halign="left" height="16" left="27" mouse_opaque="true"
+	     name="network" v_pad="0" width="128">
+		Network:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-80" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+	     h_pad="0" halign="left" height="16" left="110" mouse_opaque="true"
+	     name="network_text" right="-10" v_pad="0">
+		Normal
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-96" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+	     mouse_opaque="true" name="network_lag_cause" right="-32" v_pad="0" />
+	<button bottom="-120" enabled="true" follows="top|left" font="SansSerif"
+	     halign="center" height="16" image_selected="lag_status_good.tga"
+	     image_unselected="lag_status_good.tga" label="" label_selected="" left="8"
+	     mouse_opaque="true" name="server_lagmeter" scale_image="true"
+	     tab_stop="false" tool_tip="Server lag status" width="16" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-120" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="27"
+	     mouse_opaque="true" name="server" v_pad="0" width="60">
+		Server:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-120" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="85"
+	     mouse_opaque="true" name="server_text" right="-10" v_pad="0">
+		Normal
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-136" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+	     mouse_opaque="true" name="server_lag_cause" right="-32" v_pad="0" />
+	<button bottom="5" follows="left|top" font="SansSerif" halign="center" height="18"
+	     help_url="http://secondlife.com/support" label="?" mouse_opaque="true"
+	     name="server_help" right="-10" width="18" />
+	<button bottom="5" follows="left|top" font="SansSerif" halign="center" height="20"
+	     label="&gt;&gt;" left="5" mouse_opaque="true" name="minimize" width="25" />
+	<string name="max_title_msg">
+		Lag Meter
+	</string>
+	<string name="max_width_px">
+		360
+	</string>
+	<string name="min_title_msg">
+		Lag
+	</string>
+	<string name="min_width_px">
+		90
+	</string>
+	<string name="client_text_msg">
+		Client
+	</string>
+	<string name="client_frame_rate_critical_fps">
+		10
+	</string>
+	<string name="client_frame_rate_warning_fps">
+		15
+	</string>
+	<string name="client_frame_time_window_bg_msg">
+		Normal, window in background
+	</string>
+	<string name="client_frame_time_critical_msg">
+		Client frame rate below [CLIENT_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="client_frame_time_warning_msg">
+		Client frame rate between [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING]
+	</string>
+	<string name="client_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="client_draw_distance_cause_msg">
+		Possible cause: Draw distance set too high
+	</string>
+	<string name="client_texture_loading_cause_msg">
+		Possible cause: Images loading
+	</string>
+	<string name="client_texture_memory_cause_msg">
+		Possible cause: Too many images in memory
+	</string>
+	<string name="client_complex_objects_cause_msg">
+		Possible cause: Too many complex objects in scene
+	</string>
+	<string name="network_text_msg">
+		Network
+	</string>
+	<string name="network_packet_loss_critical_pct">
+		10
+	</string>
+	<string name="network_packet_loss_warning_pct">
+		5
+	</string>
+	<string name="network_packet_loss_critical_msg">
+		Connection is dropping over [NETWORK_PACKET_LOSS_CRITICAL]% of packets
+	</string>
+	<string name="network_packet_loss_warning_msg">
+		Connection is dropping [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% of packets
+	</string>
+	<string name="network_performance_normal_msg">
+		Normal
+	</string>
+	<string name="network_ping_critical_ms">
+		600
+	</string>
+	<string name="network_ping_warning_ms">
+		300
+	</string>
+	<string name="network_ping_critical_msg">
+		Connection ping time is over [NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_ping_warning_msg">
+		Connection ping time is [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_packet_loss_cause_msg">
+		Possible bad connection or &apos;Bandwidth&apos; pref too high.
+	</string>
+	<string name="network_ping_cause_msg">
+		Possible bad connection or file-sharing app.
+	</string>
+	<string name="server_text_msg">
+		Server
+	</string>
+	<string name="server_frame_rate_critical_fps">
+		20
+	</string>
+	<string name="server_frame_rate_warning_fps">
+		30
+	</string>
+	<string name="server_single_process_max_time_ms">
+		20
+	</string>
+	<string name="server_frame_time_critical_msg">
+		Simulator framerate below [SERVER_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="server_frame_time_warning_msg">
+		Simulator framerate between [SERVER_FRAME_RATE_CRITICAL] and [SERVER_FRAME_RATE_WARNING]
+	</string>
+	<string name="server_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="server_physics_cause_msg">
+		Possible Cause: Too many physical objects
+	</string>
+	<string name="server_scripts_cause_msg">
+		Possible Cause: Too many scripted objects
+	</string>
+	<string name="server_net_cause_msg">
+		Possible Cause: Too much network traffic
+	</string>
+	<string name="server_agent_cause_msg">
+		Possible Cause: Too many moving people in region
+	</string>
+	<string name="server_images_cause_msg">
+		Possible Cause: Too many image calculations
+	</string>
+	<string name="server_generic_cause_msg">
+		Possible Cause: Simulator load too heavy
+	</string>
+	<string name="smaller_label">
+		&gt;&gt;
+	</string>
+	<string name="bigger_label">
+		&lt;&lt;
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml b/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml
index c218886..19a3d20 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml
@@ -64,5 +64,7 @@
 	     mouse_opaque="true" name="available_text" v_pad="0" width="140">
 		[AREA] sq. meters
 	</text>
-	<string name="area_string">[AREA] sq. meters</string>
+	<string name="area_string">
+		[AREA] sq. meters
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_landmark_ctrl.xml b/linden/indra/newview/skins/xui/en-us/floater_landmark_ctrl.xml
index 07a709a..30c0741 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_landmark_ctrl.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_landmark_ctrl.xml
@@ -1,40 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-516" can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="true" can_tear_off="true" enabled="true" height="320"
-     hidden="false" left="478" min_height="310" min_width="241" rect_control="FloaterLandmarkRect" 
-     mouse_opaque="true" name="landmarkpicker" title="Organize: Landmarks" width="310">
+     left="478" min_height="310" min_width="241" mouse_opaque="true"
+     name="landmarkpicker" rect_control="FloaterLandmarkRect"
+     title="Organize: Landmarks" width="310">
 	<check_box bottom="-44" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="24" hidden="false" initial_value="true" label="Show Folders"
-	     left="175" mouse_opaque="true" name="show_folders_check"
-	     radio_style="false" width="201" />
-	<search_editor bottom="-36" enabled="true" follows="left|top" height="16" hidden="false"
-	     left="20" mouse_opaque="true" name="inventory search editor" width="231" />
+	     height="24" initial_value="true" label="Show Folders" left="175"
+	     mouse_opaque="true" name="show_folders_check" radio_style="false"
+	     width="201" />
+	<search_editor bottom="-36" enabled="true" follows="left|top" height="16" left="20"
+	     mouse_opaque="true" name="inventory search editor" width="231" />
 	<inventory_panel allow_multi_select="false" border="true" bottom="-256" enabled="true"
-	     follows="left|top|right|bottom" height="216" hidden="false" left="20"
-	     mouse_opaque="true" name="inventory panel"
-	     sort_order="TexturePickerSortOrder" width="231" />
-	<button bottom="-282" enabled="true" follows="bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="New"
-	     label_selected="New" left="20" mouse_opaque="true" name="New"
-	     scale_image="true" width="100" />
-	<button bottom="-282" enabled="true" follows="bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Rename"
-	     label_selected="Rename" left="125" mouse_opaque="true" name="Rename"
-	     scale_image="true" width="100" />
-	<button bottom="-282" enabled="true" follows="bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="New Folder"
-	     label_selected="New Folder" left="230" mouse_opaque="true" name="NewFolder"
-	     scale_image="true" width="100" />
-	<button bottom="-307" enabled="true" follows="bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Edit"
-	     label_selected="Edit" left="20" mouse_opaque="true" name="Edit"
-	     scale_image="true" width="100" />
-	<button bottom="-307" enabled="true" follows="bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Delete"
-	     label_selected="Delete" left="125" mouse_opaque="true" name="Delete"
-	     scale_image="true" width="100" />
-	<button bottom="-307" enabled="true" follows="bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Close"
-	     label_selected="Close" left="230" mouse_opaque="true" name="Close"
-	     scale_image="true" width="100" />
+	     follows="left|top|right|bottom" height="216" left="20" mouse_opaque="true"
+	     name="inventory panel" sort_order="TexturePickerSortOrder" width="231" />
+	<button bottom="-282" enabled="true" follows="bottom" font="SansSerif" halign="center"
+	     height="20" label="New" label_selected="New" left="20" mouse_opaque="true"
+	     name="New" scale_image="true" width="100" />
+	<button bottom="-282" enabled="true" follows="bottom" font="SansSerif" halign="center"
+	     height="20" label="Rename" label_selected="Rename" left="125"
+	     mouse_opaque="true" name="Rename" scale_image="true" width="100" />
+	<button bottom="-282" enabled="true" follows="bottom" font="SansSerif" halign="center"
+	     height="20" label="New Folder" label_selected="New Folder" left="230"
+	     mouse_opaque="true" name="NewFolder" scale_image="true" width="100" />
+	<button bottom="-307" enabled="true" follows="bottom" font="SansSerif" halign="center"
+	     height="20" label="Edit" label_selected="Edit" left="20"
+	     mouse_opaque="true" name="Edit" scale_image="true" width="100" />
+	<button bottom="-307" enabled="true" follows="bottom" font="SansSerif" halign="center"
+	     height="20" label="Delete" label_selected="Delete" left="125"
+	     mouse_opaque="true" name="Delete" scale_image="true" width="100" />
+	<button bottom="-307" enabled="true" follows="bottom" font="SansSerif" halign="center"
+	     height="20" label="Close" label_selected="Close" left="230"
+	     mouse_opaque="true" name="Close" scale_image="true" width="100" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml
index 97dc3b5..330c3aa 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml
@@ -1,18 +1,20 @@
 <?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"
-     hidden="false" left="306" min_height="271" min_width="290"
-     mouse_opaque="true" name="script ed float"
+     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" hidden="false" label="Reset"
-	     label_selected="Reset" left="362" mouse_opaque="true" name="Reset"
-	     width="128" />
+	     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" hidden="false" initial_value="true" label="Running" left="12"
+	     height="18" initial_value="true" label="Running" left="12"
 	     mouse_opaque="true" name="running" radio_style="false" width="100" />
 	<panel bottom="-527" enabled="true" follows="left|top|right|bottom" height="506"
-	     hidden="false" left="1" name="script ed panel" width="498" />
-
-	<text name="not_allowed" hidden="true">You are not allowed to view this script.</text>
+	     left="1" name="script ed panel" width="498" />
+	<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/xui/en-us/floater_lsl_guide.xml b/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml
index 773b54b..1f25c74 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml
@@ -1,20 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-500" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" follows="left|top" height="400"
-     hidden="false" left="306" min_height="271" min_width="350"
-     mouse_opaque="true" name="script ed float" rect_control="LSLHelpRect"
-     title="LSL Wiki" width="370">
+     can_resize="true" enabled="true" follows="left|top" height="400" left="306"
+     min_height="271" min_width="350" mouse_opaque="true" name="script ed float"
+     rect_control="LSLHelpRect" title="LSL Wiki" width="370">
 	<check_box bottom="-45" enabled="true" follows="top|left" font="SansSerif" halign="center"
-	     height="20" hidden="false" label="Follow cursor" left="10"
-	     mouse_opaque="true" name="lock_check" width="60" />
+	     height="20" label="Follow cursor" left="10" mouse_opaque="true"
+	     name="lock_check" width="60" />
 	<combo_box allow_text_entry="true" bottom_delta="0" enabled="true"
 	     follows="top|left|right" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Lock" left_delta="100" mouse_opaque="true"
-	     name="history_combo" width="90" />
+	     label="Lock" left_delta="100" mouse_opaque="true" name="history_combo"
+	     width="90" />
 	<button bottom_delta="0" enabled="true" follows="top|right" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Back" left_delta="95"
+	     halign="center" height="20" label="Back" left_delta="95"
 	     mouse_opaque="true" name="back_btn" width="70" />
 	<button bottom_delta="0" enabled="true" follows="top|right" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Forward" left_delta="75"
+	     halign="center" height="20" label="Forward" left_delta="75"
 	     mouse_opaque="true" name="fwd_btn" width="70" />
 	<web_browser bottom="10" follows="left|right|top|bottom" left="10" name="lsl_guide_html"
 	     right="-10" top="-50" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/xui/en-us/floater_media_browser.xml
new file mode 100644
index 0000000..e6b0d0f
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_media_browser.xml
@@ -0,0 +1,37 @@
+<?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="440" min_height="140" min_width="432" name="floater_about"
+     rect_control="FloaterMediaRect" title="Media Browser" width="535">
+	<layout_stack bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="515">
+		<layout_panel auto_resize="false" bottom="0" height="20" left="0" user_resize="false"
+		     width="515">
+			<button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back"
+			     width="50" />
+			<button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55"
+			     name="forward" width="60" />
+			<button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
+			     left_delta="65" name="reload" width="60" />
+			<combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
+			     left_delta="65" max_chars="255" name="address" width="295" />
+			<button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
+			     left_delta="300" name="go" width="30" />
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" height="20" left="0"
+		     name="parcel_owner_controls" user_resize="false" width="515">
+			<button bottom="0" enabled="false" follows="left|top" height="20"
+			     label="Send Current URL to Parcel" left="0" name="assign" width="200" />
+		</layout_panel>
+		<layout_panel auto_resize="true" bottom="0" height="20" left="0" user_resize="false"
+		     width="515">
+			<web_browser bottom="30" follows="left|right|top|bottom" left="0" name="browser" top="20"
+			     width="515" />
+			<button bottom="5" follows="bottom|left" height="20" label="Open in My Web Browser"
+			     left="0" name="open_browser" width="150" />
+			<check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
+			     label="Always open in my web browser" left_delta="155" name="open_always"
+			     width="200" />
+			<button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
+			     name="close" width="70" />
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_moveview.xml b/linden/indra/newview/skins/xui/en-us/floater_moveview.xml
index dc7ac7c..e87c1e7 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_moveview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_moveview.xml
@@ -1,61 +1,56 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-976" can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="false" can_tear_off="true" enabled="true" follows="bottom"
-     height="58" hidden="false" left="521" min_height="100" min_width="100"
-     mouse_opaque="true" name="move floater" rect_control="FloaterMoveRect"
-     title="" width="185">
+     height="58" left="521" min_height="100" min_width="100" mouse_opaque="true"
+     name="move floater" rect_control="FloaterMoveRect" title="" width="185">
 	<button bottom="-54" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="25" hidden="false"
-	     image_disabled="UIImgBtnLeftOutUUID"
+	     halign="center" height="25" image_disabled="UIImgBtnLeftOutUUID"
 	     image_disabled_selected="UIImgBtnLeftInUUID"
 	     image_selected="UIImgBtnLeftInUUID" image_unselected="UIImgBtnLeftOutUUID"
 	     label="" label_selected="" left="20" mouse_opaque="true"
 	     name="turn left btn" scale_image="false" tool_tip="Turn Left" width="25" />
 	<button bottom="-54" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="25" hidden="false"
-	     image_disabled="UIImgBtnRightOutUUID"
+	     halign="center" height="25" image_disabled="UIImgBtnRightOutUUID"
 	     image_disabled_selected="UIImgBtnRightInUUID"
 	     image_selected="UIImgBtnRightInUUID"
 	     image_unselected="UIImgBtnRightOutUUID" label="" label_selected=""
 	     left="66" mouse_opaque="true" name="turn right btn" scale_image="false"
 	     tool_tip="Turn Right" width="25" />
 	<button bottom="-29" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="25" hidden="false"
-	     image_disabled="UIImgBtnMoveUpOutUUID"
+	     halign="center" height="25" image_disabled="UIImgBtnMoveUpOutUUID"
 	     image_disabled_selected="UIImgBtnMoveUpInUUID"
 	     image_selected="UIImgBtnMoveUpInUUID"
 	     image_unselected="UIImgBtnMoveUpOutUUID" label="" label_selected=""
 	     left="91" mouse_opaque="true" name="move up btn" scale_image="false"
 	     tool_tip="Jump or Fly Up" width="25" />
 	<button bottom="-54" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="25" hidden="false"
-	     image_disabled="UIImgBtnMoveDownOutUUID"
+	     halign="center" height="25" image_disabled="UIImgBtnMoveDownOutUUID"
 	     image_disabled_selected="UIImgBtnMoveDownInUUID"
 	     image_selected="UIImgBtnMoveDownInUUID"
 	     image_unselected="UIImgBtnMoveDownOutUUID" label="" label_selected=""
 	     left="91" mouse_opaque="true" name="move down btn" scale_image="false"
 	     tool_tip="Crouch or Fly Down" width="25" />
 	<button bottom="-54" control_name="FlyBtnState" enabled="true" follows="left|bottom"
-	     font="SansSerif" halign="center" height="20" hidden="false" label="Fly"
+	     font="SansSerif" halign="center" height="20" label="Fly"
 	     label_selected="Fly" left="116" mouse_opaque="true" name="fly btn"
 	     scale_image="true" tool_tip="Start or stop flying" width="65" />
 	<joystick_slide bottom="-29" enabled="true" follows="left|bottom" halign="center" height="25"
-	     hidden="false" image_selected="UIImgBtnSlideLeftInUUID"
+	     image_selected="UIImgBtnSlideLeftInUUID"
 	     image_unselected="UIImgBtnSlideLeftOutUUID" left="20" mouse_opaque="true"
 	     name="slide left btn" quadrant="left" scale_image="false"
 	     tool_tip="Move Left" width="25" />
 	<joystick_slide bottom="-29" enabled="true" follows="left|bottom" halign="center" height="25"
-	     hidden="false" image_selected="UIImgBtnSlideRightInUUID"
+	     image_selected="UIImgBtnSlideRightInUUID"
 	     image_unselected="UIImgBtnSlideRightOutUUID" left="66" mouse_opaque="true"
 	     name="slide right btn" quadrant="right" scale_image="false"
 	     tool_tip="Move Right" width="25" />
 	<joystick_turn bottom="-29" enabled="true" follows="left|bottom" halign="center" height="25"
-	     hidden="false" image_selected="UIImgBtnForwardInUUID"
+	     image_selected="UIImgBtnForwardInUUID"
 	     image_unselected="UIImgBtnForwardOutUUID" left="45" mouse_opaque="true"
 	     name="forward btn" quadrant="up" scale_image="false"
 	     tool_tip="Move Forward" width="21" />
 	<joystick_turn bottom="-54" enabled="true" follows="left|bottom" halign="center" height="25"
-	     hidden="false" image_selected="move_backward_in.tga"
+	     image_selected="move_backward_in.tga"
 	     image_unselected="move_backward_out.tga" left="45" mouse_opaque="true"
 	     name="backward btn" quadrant="down" scale_image="false"
 	     tool_tip="Move Backward" width="21" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute.xml b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
index 8ff118f..338d391 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-384" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" can_tear_off="true" enabled="true" height="300"
-     hidden="false" left="45" min_height="140" min_width="220"
-     mouse_opaque="true" name="mute floater" rect_control="FloaterMuteRect3"
-     title="Muted Residents &amp; Objects" short_title="Mute List" width="300">
+     can_resize="true" can_tear_off="true" enabled="true" height="300" left="45"
+     min_height="140" min_width="220" mouse_opaque="true" name="mute floater"
+     rect_control="FloaterMuteRect3" short_title="Mute List"
+     title="Muted Residents &amp; Objects" width="300">
 	<scroll_list background_visible="false" bottom="-220" column_padding="5" draw_border="true"
 	     draw_heading="false" draw_stripes="true" enabled="true"
 	     fg_disable_color="1 1 1 1" fg_selected_color="1 1 1 1"
 	     fg_unselected_color="1 1 1 1" follows="left|top|right|bottom" height="200"
-	     hidden="false" left="4" mouse_opaque="true" multi_select="false"
-	     name="mutes" tool_tip="List of currently muted residents" width="292" />
+	     left="4" mouse_opaque="true" multi_select="false" name="mutes"
+	     tool_tip="List of currently muted residents" width="292" />
 	<button bottom="-244" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Mute Resident..."
+	     halign="center" height="20" label="Mute Resident..."
 	     label_selected="Mute Resident..." left="4" mouse_opaque="true"
 	     name="Mute resident..." tool_tip="Pick a resident to mute" width="210" />
 	<button bottom="-268" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Mute object by name..."
+	     halign="center" height="20" label="Mute object by name..."
 	     label_selected="Mute object by name..." left="4" mouse_opaque="true"
 	     name="Mute object by name..." width="210" />
 	<button bottom="-292" enabled="false" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Unmute"
-	     label_selected="Unmute" left="4" mouse_opaque="true" name="Unmute"
+	     halign="center" height="20" label="Unmute" label_selected="Unmute" left="4"
+	     mouse_opaque="true" name="Unmute"
 	     tool_tip="Remove resident or object from muted list" width="210" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml b/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
index db064dc..2c277e7 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
@@ -2,13 +2,13 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="140" min_height="140" min_width="375"
      name="mute by name" title="Mute object by name" width="375">
-	<text left_delta="25" bottom_delta="-50" font="SansSerif" follows="top|left" height="16" left="20"
-	     name="message" right="380" text_color="white">
-Mute by name only affects object chat and IM, not sounds.
+	<text bottom_delta="-50" follows="top|left" font="SansSerif" height="16" left="20"
+	     left_delta="25" name="message" right="380" text_color="white">
+		Mute by name only affects object chat and IM, not sounds.
 You must type the object&apos;s name exactly.
 	</text>
-	<line_editor bottom_delta="-40" follows="top|right" height="18" left_delta="0"
-	     name="object_name" width="320" font="SansSerif">
+	<line_editor bottom_delta="-40" follows="top|right" font="SansSerif" height="18"
+	     left_delta="0" name="object_name" width="320">
 		Object name
 	</line_editor>
 	<button bottom_delta="-30" follows="bottom|left" height="20" label="Ok" left="108"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
index 264286d..1d5bf90 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="false" can_drag_on_left="false" can_minimize="true"
      can_resize="true" can_tear_off="true" height="390" min_height="240"
-     rect_control="FloaterContactsRect"
-     min_width="365" name="floater_my_friends" title="Contacts" width="395">
+     min_width="365" name="floater_my_friends"
+     rect_control="FloaterContactsRect" title="Contacts" width="395">
 	<tab_container bottom="10" follows="left|right|top|bottom" height="360" left="0"
 	     name="friends_and_groups" tab_position="top" tab_width="80" width="388">
 		<panel bottom="0" filename="panel_friends.xml" label="Friends" left="0"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_new_im.xml b/linden/indra/newview/skins/xui/en-us/floater_new_im.xml
index 94e3714..c93b890 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_new_im.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_new_im.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater border="true" bottom="-297" can_close="false" can_drag_on_left="false"
      can_minimize="false" can_resize="false" can_tear_off="false" enabled="true"
-     follows="left|top|right|bottom" height="296" hidden="false" label="New IM"
-     left="1" min_height="100" min_width="100" mouse_opaque="false"
-     name="New IM" title="New IM" width="501">
+     follows="left|top|right|bottom" height="296" label="New IM" left="1"
+     min_height="100" min_width="100" mouse_opaque="false" name="New IM"
+     title="New IM" width="501">
 	<name_list allow_calling_card_drop="false" background_visible="true" bottom="-293"
 	     column_padding="5" draw_border="true" draw_heading="false"
 	     draw_stripes="true" enabled="true" follows="left|top|right|bottom"
-	     height="290" hidden="false" left="6" mouse_opaque="true"
-	     multi_select="false" name="user_list" width="421" />
+	     height="290" left="6" mouse_opaque="true" multi_select="false"
+	     name="user_list" width="421" />
 	<button bottom="-271" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Start"
-	     label_selected="Start" left="435" mouse_opaque="true" name="start_btn"
-	     scale_image="true" sound_flags="0" width="60" />
+	     halign="center" height="20" label="Start" label_selected="Start" left="435"
+	     mouse_opaque="true" name="start_btn" scale_image="true" sound_flags="0"
+	     width="60" />
 	<button bottom="-293" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Close"
-	     label_selected="Close" left="435" mouse_opaque="true" name="close_btn"
-	     scale_image="true" sound_flags="0" width="60" />
-	<text hidden="true" name="name_format">
+	     halign="center" height="20" label="Close" label_selected="Close" left="435"
+	     mouse_opaque="true" name="close_btn" scale_image="true" sound_flags="0"
+	     width="60" />
+	<string name="name_format">
 		[FIRST] [LAST]
-	</text>
-	<text hidden="true" name="online_descriptor">
+	</string>
+	<string name="online_descriptor">
 		(online)
-	</text>
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/xui/en-us/floater_new_outfit_dialog.xml
index f3d5c3a..568f155 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_new_outfit_dialog.xml
@@ -1,210 +1,209 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater border="true" bottom="167" can_close="false" can_drag_on_left="false"
      can_minimize="false" can_resize="false" can_tear_off="true" enabled="true"
-     height="510" hidden="false" left="278" min_height="100" min_width="100"
-     mouse_opaque="true" name="modal container" title=" " width="515">
+     height="510" left="278" min_height="100" min_width="100"
+     mouse_opaque="true" name="modal container" title="" width="515">
 	<button bottom="-488" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Save" label_selected="Save" left="171"
-	     mouse_opaque="true" name="Save" scale_image="true" width="82" />
+	     label="Save" label_selected="Save" left="171" mouse_opaque="true"
+	     name="Save" scale_image="true" width="82" />
 	<button bottom="-488" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Cancel" label_selected="Cancel" left="261"
-	     mouse_opaque="true" name="Cancel" scale_image="true" width="82" />
+	     label="Cancel" label_selected="Cancel" left="261" mouse_opaque="true"
+	     name="Cancel" scale_image="true" width="82" />
 	<check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Shape" left="13"
+	     height="16" initial_value="false" label="Shape" left="13"
 	     mouse_opaque="true" name="checkbox_Shape" radio_style="false" width="100" />
 	<check_box bottom="-236" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Skin" left="13"
+	     height="16" initial_value="false" label="Skin" left="13"
 	     mouse_opaque="true" name="checkbox_Skin" radio_style="false" width="100" />
 	<check_box bottom="-256" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Hair" left="13"
+	     height="16" initial_value="false" label="Hair" left="13"
 	     mouse_opaque="true" name="checkbox_Hair" radio_style="false" width="100" />
 	<check_box bottom="-276" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Eyes" left="13"
+	     height="16" initial_value="false" label="Eyes" left="13"
 	     mouse_opaque="true" name="checkbox_Eyes" radio_style="false" width="100" />
 	<check_box bottom="-434" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false"
-	     label="Rename Clothing To Folder Name" left="13" mouse_opaque="true"
-	     name="rename" radio_style="false" width="210" />
+	     height="16" initial_value="false" label="Rename Clothing To Folder Name"
+	     left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />
 	<check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Shirt" left="113"
+	     height="16" initial_value="false" label="Shirt" left="113"
 	     mouse_opaque="true" name="checkbox_Shirt" radio_style="false" width="100" />
 	<check_box bottom="-236" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Pants" left="113"
+	     height="16" initial_value="false" label="Pants" left="113"
 	     mouse_opaque="true" name="checkbox_Pants" radio_style="false" width="100" />
 	<check_box bottom="-256" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Shoes" left="113"
+	     height="16" initial_value="false" label="Shoes" left="113"
 	     mouse_opaque="true" name="checkbox_Shoes" radio_style="false" width="100" />
 	<check_box bottom="-276" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Socks" left="113"
+	     height="16" initial_value="false" label="Socks" left="113"
 	     mouse_opaque="true" name="checkbox_Socks" radio_style="false" width="100" />
 	<check_box bottom="-296" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Jacket" left="113"
+	     height="16" initial_value="false" label="Jacket" left="113"
 	     mouse_opaque="true" name="checkbox_Jacket" radio_style="false" width="100" />
 	<check_box bottom="-316" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Gloves" left="113"
+	     height="16" initial_value="false" label="Gloves" left="113"
 	     mouse_opaque="true" name="checkbox_Gloves" radio_style="false" width="100" />
 	<check_box bottom="-336" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Undershirt"
-	     left="113" mouse_opaque="true" name="checkbox_Undershirt"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Undershirt" left="113"
+	     mouse_opaque="true" name="checkbox_Undershirt" radio_style="false"
+	     width="100" />
 	<check_box bottom="-356" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Underpants"
-	     left="113" mouse_opaque="true" name="checkbox_Underpants"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Underpants" left="113"
+	     mouse_opaque="true" name="checkbox_Underpants" radio_style="false"
+	     width="100" />
 	<check_box bottom="-376" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Skirt" left="113"
+	     height="16" initial_value="false" label="Skirt" left="113"
 	     mouse_opaque="true" name="checkbox_Skirt" radio_style="false" width="100" />
 	<check_box bottom="-216" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Chest" left="213"
+	     height="16" initial_value="false" label="Chest" left="213"
 	     mouse_opaque="true" name="checkbox_Chest" radio_style="false" width="100" />
 	<check_box bottom="-236" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="true" label="Skull" left="213"
+	     height="16" initial_value="true" label="Skull" left="213"
 	     mouse_opaque="true" name="checkbox_Skull" radio_style="false" width="100" />
 	<check_box bottom="-256" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Left Shoulder"
-	     left="213" mouse_opaque="true" name="checkbox_Left Shoulder"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Left Shoulder" left="213"
+	     mouse_opaque="true" name="checkbox_Left Shoulder" radio_style="false"
+	     width="100" />
 	<check_box bottom="-276" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Right Shoulder"
-	     left="213" mouse_opaque="true" name="checkbox_Right Shoulder"
-	     radio_style="false" width="106" />
+	     height="16" initial_value="false" label="Right Shoulder" left="213"
+	     mouse_opaque="true" name="checkbox_Right Shoulder" radio_style="false"
+	     width="106" />
 	<check_box bottom="-296" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Left Hand"
-	     left="213" mouse_opaque="true" name="checkbox_Left Hand"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Left Hand" left="213"
+	     mouse_opaque="true" name="checkbox_Left Hand" radio_style="false"
+	     width="100" />
 	<check_box bottom="-316" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Right Hand"
-	     left="213" mouse_opaque="true" name="checkbox_Right Hand"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Right Hand" left="213"
+	     mouse_opaque="true" name="checkbox_Right Hand" radio_style="false"
+	     width="100" />
 	<check_box bottom="-336" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="true" label="Left Foot"
-	     left="213" mouse_opaque="true" name="checkbox_Left Foot"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="true" label="Left Foot" left="213"
+	     mouse_opaque="true" name="checkbox_Left Foot" radio_style="false"
+	     width="100" />
 	<check_box bottom="-356" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="true" label="Right Foot"
-	     left="213" mouse_opaque="true" name="checkbox_Right Foot"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="true" label="Right Foot" left="213"
+	     mouse_opaque="true" name="checkbox_Right Foot" radio_style="false"
+	     width="100" />
 	<check_box bottom="-376" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Spine" left="213"
+	     height="16" initial_value="false" label="Spine" left="213"
 	     mouse_opaque="true" name="checkbox_Spine" radio_style="false" width="100" />
 	<check_box bottom="-396" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Pelvis" left="213"
+	     height="16" initial_value="false" label="Pelvis" left="213"
 	     mouse_opaque="true" name="checkbox_Pelvis" radio_style="false" width="100" />
 	<check_box bottom="-416" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Mouth" left="213"
+	     height="16" initial_value="false" label="Mouth" left="213"
 	     mouse_opaque="true" name="checkbox_Mouth" radio_style="false" width="100" />
 	<check_box bottom="-436" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Chin" left="213"
+	     height="16" initial_value="false" label="Chin" left="213"
 	     mouse_opaque="true" name="checkbox_Chin" radio_style="false" width="100" />
 	<check_box bottom="-456" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Left Ear"
-	     left="213" mouse_opaque="true" name="checkbox_Left Ear" radio_style="false"
+	     height="16" initial_value="false" label="Left Ear" left="213"
+	     mouse_opaque="true" name="checkbox_Left Ear" radio_style="false"
 	     width="100" />
 	<check_box bottom="-216" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Right Ear"
-	     left="313" mouse_opaque="true" name="checkbox_Right Ear"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Right Ear" left="313"
+	     mouse_opaque="true" name="checkbox_Right Ear" radio_style="false"
+	     width="100" />
 	<check_box bottom="-236" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Left Eyeball"
-	     left="313" mouse_opaque="true" name="checkbox_Left Eyeball"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Left Eyeball" left="313"
+	     mouse_opaque="true" name="checkbox_Left Eyeball" radio_style="false"
+	     width="100" />
 	<check_box bottom="-256" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Right Eyeball"
-	     left="313" mouse_opaque="true" name="checkbox_Right Eyeball"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Right Eyeball" left="313"
+	     mouse_opaque="true" name="checkbox_Right Eyeball" radio_style="false"
+	     width="100" />
 	<check_box bottom="-276" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Nose" left="313"
+	     height="16" initial_value="false" label="Nose" left="313"
 	     mouse_opaque="true" name="checkbox_Nose" radio_style="false" width="100" />
 	<check_box bottom="-296" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="R Upper Arm"
-	     left="313" mouse_opaque="true" name="checkbox_R Upper Arm"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="R Upper Arm" left="313"
+	     mouse_opaque="true" name="checkbox_R Upper Arm" radio_style="false"
+	     width="100" />
 	<check_box bottom="-316" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="R Forearm"
-	     left="313" mouse_opaque="true" name="checkbox_R Forearm"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="R Forearm" left="313"
+	     mouse_opaque="true" name="checkbox_R Forearm" radio_style="false"
+	     width="100" />
 	<check_box bottom="-336" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="L Upper Arm"
-	     left="313" mouse_opaque="true" name="checkbox_L Upper Arm"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="L Upper Arm" left="313"
+	     mouse_opaque="true" name="checkbox_L Upper Arm" radio_style="false"
+	     width="100" />
 	<check_box bottom="-356" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="L Forearm"
-	     left="313" mouse_opaque="true" name="checkbox_L Forearm"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="L Forearm" left="313"
+	     mouse_opaque="true" name="checkbox_L Forearm" radio_style="false"
+	     width="100" />
 	<check_box bottom="-376" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Right Hip"
-	     left="313" mouse_opaque="true" name="checkbox_Right Hip"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Right Hip" left="313"
+	     mouse_opaque="true" name="checkbox_Right Hip" radio_style="false"
+	     width="100" />
 	<check_box bottom="-396" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="R Upper Leg"
-	     left="313" mouse_opaque="true" name="checkbox_R Upper Leg"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="R Upper Leg" left="313"
+	     mouse_opaque="true" name="checkbox_R Upper Leg" radio_style="false"
+	     width="100" />
 	<check_box bottom="-416" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="true" label="R Lower Leg"
-	     left="313" mouse_opaque="true" name="checkbox_R Lower Leg"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="true" label="R Lower Leg" left="313"
+	     mouse_opaque="true" name="checkbox_R Lower Leg" radio_style="false"
+	     width="100" />
 	<check_box bottom="-436" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Left Hip"
-	     left="313" mouse_opaque="true" name="checkbox_Left Hip" radio_style="false"
+	     height="16" initial_value="false" label="Left Hip" left="313"
+	     mouse_opaque="true" name="checkbox_Left Hip" radio_style="false"
 	     width="100" />
 	<check_box bottom="-456" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="L Upper Leg"
-	     left="313" mouse_opaque="true" name="checkbox_L Upper Leg"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="L Upper Leg" left="313"
+	     mouse_opaque="true" name="checkbox_L Upper Leg" radio_style="false"
+	     width="100" />
 	<check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="true" label="L Lower Leg"
-	     left="413" mouse_opaque="true" name="checkbox_L Lower Leg"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="true" label="L Lower Leg" left="413"
+	     mouse_opaque="true" name="checkbox_L Lower Leg" radio_style="false"
+	     width="100" />
 	<check_box bottom="-236" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Stomach" left="413"
+	     height="16" initial_value="false" label="Stomach" left="413"
 	     mouse_opaque="true" name="checkbox_Stomach" radio_style="false" width="100" />
 	<check_box bottom="-256" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Left Pec"
-	     left="413" mouse_opaque="true" name="checkbox_Left Pec" radio_style="false"
+	     height="16" initial_value="false" label="Left Pec" left="413"
+	     mouse_opaque="true" name="checkbox_Left Pec" radio_style="false"
 	     width="100" />
 	<check_box bottom="-276" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Right Pec"
-	     left="413" mouse_opaque="true" name="checkbox_Right Pec"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Right Pec" left="413"
+	     mouse_opaque="true" name="checkbox_Right Pec" radio_style="false"
+	     width="100" />
 	<check_box bottom="-296" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Center 2"
-	     left="413" mouse_opaque="true" name="checkbox_Center 2" radio_style="false"
+	     height="16" initial_value="false" label="Center 2" left="413"
+	     mouse_opaque="true" name="checkbox_Center 2" radio_style="false"
 	     width="100" />
 	<check_box bottom="-316" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Top Right"
-	     left="413" mouse_opaque="true" name="checkbox_Top Right"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Top Right" left="413"
+	     mouse_opaque="true" name="checkbox_Top Right" radio_style="false"
+	     width="100" />
 	<check_box bottom="-336" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Top" left="413"
+	     height="16" initial_value="false" label="Top" left="413"
 	     mouse_opaque="true" name="checkbox_Top" radio_style="false" width="100" />
 	<check_box bottom="-356" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Top Left"
-	     left="413" mouse_opaque="true" name="checkbox_Top Left" radio_style="false"
+	     height="16" initial_value="false" label="Top Left" left="413"
+	     mouse_opaque="true" name="checkbox_Top Left" radio_style="false"
 	     width="100" />
 	<check_box bottom="-376" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Center" left="413"
+	     height="16" initial_value="false" label="Center" left="413"
 	     mouse_opaque="true" name="checkbox_Center" radio_style="false" width="100" />
 	<check_box bottom="-396" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Bottom Left"
-	     left="413" mouse_opaque="true" name="checkbox_Bottom Left"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Bottom Left" left="413"
+	     mouse_opaque="true" name="checkbox_Bottom Left" radio_style="false"
+	     width="100" />
 	<check_box bottom="-416" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Bottom" left="413"
+	     height="16" initial_value="false" label="Bottom" left="413"
 	     mouse_opaque="true" name="checkbox_Bottom" radio_style="false" width="100" />
 	<check_box bottom="-436" enabled="false" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Bottom Right"
-	     left="413" mouse_opaque="true" name="checkbox_Bottom Right"
-	     radio_style="false" width="100" />
+	     height="16" initial_value="false" label="Bottom Right" left="413"
+	     mouse_opaque="true" name="checkbox_Bottom Right" radio_style="false"
+	     width="100" />
 	<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="16" hidden="false"
-	     left="13" mouse_opaque="true" name="Make New Outfit" v_pad="0" width="489">
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="13"
+	     mouse_opaque="true" name="Make New Outfit" v_pad="0" width="489">
 		Make New Outfit
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-102" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="70" hidden="false"
-	     left="13" mouse_opaque="true"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="70" left="13"
+	     mouse_opaque="true"
 	     name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it."
 	     v_pad="0" width="489">
 		Outfits are folders that contain clothing and body parts.
@@ -215,46 +214,46 @@ now wearing into it.
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-126" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-	     left="13" mouse_opaque="true" name="Folder name:" v_pad="0" width="489">
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="13"
+	     mouse_opaque="true" name="Folder name:" v_pad="0" width="489">
 		Folder name:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-174" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-	     left="13" mouse_opaque="true" name="Items to include in outfit:" v_pad="0"
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="13"
+	     mouse_opaque="true" name="Items to include in outfit:" v_pad="0"
 	     width="489">
 		Items to include in outfit:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-	     left="13" mouse_opaque="true" name="Body Parts:" v_pad="0" width="100">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
+	     mouse_opaque="true" name="Body Parts:" v_pad="0" width="100">
 		Body Parts:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-	     left="113" mouse_opaque="true" name="Clothes:" v_pad="0" width="100">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="113"
+	     mouse_opaque="true" name="Clothes:" v_pad="0" width="100">
 		Clothes:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-	     left="213" mouse_opaque="true" name="Attachments:" v_pad="0" width="100">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="213"
+	     mouse_opaque="true" name="Attachments:" v_pad="0" width="100">
 		Attachments:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-414" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-	     left="13" mouse_opaque="true" name="Options:" v_pad="0" width="100">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
+	     mouse_opaque="true" name="Options:" v_pad="0" width="100">
 		Options:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-150"
 	     enabled="true" follows="left|top" font="SansSerif"
-	     handle_edit_keys_directly="true" height="20" hidden="false" left="13"
-	     max_length="63" mouse_opaque="true" name="name ed"
-	     select_all_on_focus_received="false" select_on_focus="false" width="489">
+	     handle_edit_keys_directly="true" height="20" left="13" max_length="63"
+	     mouse_opaque="true" name="name ed" select_all_on_focus_received="false"
+	     select_on_focus="false" width="489">
 		New Outfit
 	</line_editor>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_openobject.xml b/linden/indra/newview/skins/xui/en-us/floater_openobject.xml
index c7a053d..c7dd2c1 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_openobject.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_openobject.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-551" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" can_tear_off="true" enabled="true" height="350"
-     hidden="false" left="385" min_height="160" min_width="270"
-     mouse_opaque="true" name="objectcontents" default_tab_group="1"
+     can_resize="true" can_tear_off="true" default_tab_group="1" enabled="true"
+     height="350" left="385" min_height="160" min_width="270"
+     mouse_opaque="true" name="objectcontents"
      rect_control="FloaterOpenObjectRect" title="Object Contents" width="300">
 	<panel bottom="-320" enabled="true" follows="left|top|right|bottom" height="276"
-	     hidden="false" left="8" mouse_opaque="true" name="object_contents"
-	     width="284" />
+	     left="8" mouse_opaque="true" name="object_contents" width="284" />
 	<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|right" font="SansSerif" h_pad="0" halign="left"
-	     height="16" hidden="false" left="8" mouse_opaque="true" name="object_name"
-	     v_pad="0" width="284">
+	     height="16" left="8" mouse_opaque="true" name="object_name" v_pad="0"
+	     width="284">
 		[DESC]:
 	</text>
 	<button bottom="-345" enabled="true" follows="bottom|left" font="SansSerifSmall"
-	     halign="center" height="20" hidden="false" label="Copy To Inventory"
-	     label_selected="Copy To Inventory" left="10" mouse_opaque="true" tab_group="1"
-	     name="copy_to_inventory_button" scale_image="true" width="120" />
+	     halign="center" height="20" label="Copy To Inventory"
+	     label_selected="Copy To Inventory" left="10" mouse_opaque="true"
+	     name="copy_to_inventory_button" scale_image="true" tab_group="1"
+	     width="120" />
 	<button bottom="-345" enabled="true" follows="bottom|left" font="SansSerifSmall"
-	     halign="center" height="20" hidden="false" label="Copy And Wear"
+	     halign="center" height="20" label="Copy And Wear"
 	     label_selected="Copy And Wear" left="140" mouse_opaque="true"
 	     name="copy_and_wear_button" scale_image="true" width="120" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_pay.xml b/linden/indra/newview/skins/xui/en-us/floater_pay.xml
index 97615ea..8f0553d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_pay.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_pay.xml
@@ -1,59 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-197" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" enabled="true" height="140" hidden="false" left="439"
-     min_height="100" min_width="100" mouse_opaque="true" name="Give Money"
+     can_resize="false" enabled="true" height="140" left="439" min_height="100"
+     min_width="100" mouse_opaque="true" name="Give Money"
      rect_control="FloaterPayRectB" title="" width="300">
 	<button bottom="-74" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="L$1" label_selected="L$1" left="108"
-	     mouse_opaque="true" name="fastpay 1" scale_image="true" width="80" />
+	     label="L$1" label_selected="L$1" left="108" mouse_opaque="true"
+	     name="fastpay 1" scale_image="true" width="80" />
 	<button bottom="-74" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="L$5" label_selected="L$5" left="203"
-	     mouse_opaque="true" name="fastpay 5" scale_image="true" width="80" />
+	     label="L$5" label_selected="L$5" left="203" mouse_opaque="true"
+	     name="fastpay 5" scale_image="true" width="80" />
 	<button bottom="-98" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="L$10" label_selected="L$10" left="108"
-	     mouse_opaque="true" name="fastpay 10" scale_image="true" width="80" />
+	     label="L$10" label_selected="L$10" left="108" mouse_opaque="true"
+	     name="fastpay 10" scale_image="true" width="80" />
 	<button bottom="-98" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="L$20" label_selected="L$20" left="203"
-	     mouse_opaque="true" name="fastpay 20" scale_image="true" width="80" />
+	     label="L$20" label_selected="L$20" left="203" mouse_opaque="true"
+	     name="fastpay 20" scale_image="true" width="80" />
 	<button bottom="-132" enabled="false" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Pay" label_selected="Pay" left="120"
-	     mouse_opaque="true" name="pay btn" scale_image="true" width="80" />
+	     label="Pay" label_selected="Pay" left="120" mouse_opaque="true"
+	     name="pay btn" scale_image="true" width="80" />
 	<button bottom="-132" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Cancel" label_selected="Cancel" left="203"
-	     mouse_opaque="true" name="cancel btn" scale_image="true" width="80" />
+	     label="Cancel" label_selected="Cancel" left="203" mouse_opaque="true"
+	     name="cancel btn" scale_image="true" width="80" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="18" hidden="false"
-	     left="12" mouse_opaque="true" name="payee_label" v_pad="0" width="75">
+	     font="SansSerif" h_pad="0" halign="left" height="18" left="12"
+	     mouse_opaque="true" name="payee_label" v_pad="0" width="75">
 		Pay resident:
 	</text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="18" hidden="false"
-	     left="85" mouse_opaque="true" name="payee_name" v_pad="0" width="210">
+	     font="SansSerif" h_pad="0" halign="left" height="18" left="85"
+	     mouse_opaque="true" name="payee_name" v_pad="0" width="210">
 		[FIRST] [LAST]
 	</text>
-	<!--text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-35" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="18" hidden="false"
-	     left="130" mouse_opaque="true" name="payee_name" v_pad="0" width="210">
-		[FIRST] [LAST]
-	</text-->
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-72" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="right" height="18" hidden="false"
-	     left="5" mouse_opaque="true" name="fastpay text" v_pad="0" width="95">
+	     font="SansSerif" h_pad="0" halign="right" height="18" left="5"
+	     mouse_opaque="true" name="fastpay text" v_pad="0" width="95">
 		Fast Pay:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="18" hidden="false"
-	     left="12" mouse_opaque="true" name="amount text" v_pad="0" width="75">
+	     font="SansSerif" h_pad="0" halign="left" height="18" left="12"
+	     mouse_opaque="true" name="amount text" v_pad="0" width="75">
 		Amount:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-130"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="18" hidden="false" left="58"
-	     max_length="9" mouse_opaque="true" name="amount"
-	     select_all_on_focus_received="false" select_on_focus="false" width="57" />
+	     handle_edit_keys_directly="false" height="18" left="58" max_length="9"
+	     mouse_opaque="true" name="amount" select_all_on_focus_received="false"
+	     select_on_focus="false" width="57" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_pay_object.xml b/linden/indra/newview/skins/xui/en-us/floater_pay_object.xml
index 1519f29..03e009d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_pay_object.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_pay_object.xml
@@ -1,73 +1,72 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-521" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" enabled="true" height="140" hidden="false" left="690"
-     min_height="100" min_width="100" mouse_opaque="true" name="Give Money"
+     can_resize="false" enabled="true" height="140" left="690" min_height="100"
+     min_width="100" mouse_opaque="true" name="Give Money"
      rect_control="FloaterPayRectB" title="" width="300">
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="right" height="18" hidden="false"
-	     left="5" mouse_opaque="true" name="payee_group" v_pad="0" width="75">
+	     font="SansSerif" h_pad="0" halign="right" height="18" left="5"
+	     mouse_opaque="true" name="payee_group" v_pad="0" width="75">
 		Pay group:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="0" drop_shadow_visible="true" enabled="true"
 	     follows="left|top" font="SansSerif" h_pad="0" halign="right" height="18"
-	     hidden="false" left="5" mouse_opaque="true" name="payee_resident" v_pad="0"
-	     width="75">
+	     left="5" mouse_opaque="true" name="payee_resident" v_pad="0" width="75">
 		Pay resident:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="18" hidden="false"
-	     left="85" mouse_opaque="true" name="payee_name" v_pad="0" width="210">
+	     font="SansSerif" h_pad="0" halign="left" height="18" left="85"
+	     mouse_opaque="true" name="payee_name" v_pad="0" width="210">
 		[FIRST] [LAST]
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-50" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="right" height="18" hidden="false"
-	     left="5" mouse_opaque="true" name="object_name_label" v_pad="0" width="75">
+	     font="SansSerif" h_pad="0" halign="right" height="18" left="5"
+	     mouse_opaque="true" name="object_name_label" v_pad="0" width="75">
 		Via object:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-50" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="18" hidden="false"
-	     left="85" mouse_opaque="true" name="object_name_text" v_pad="0" width="210">
+	     font="SansSerif" h_pad="0" halign="left" height="18" left="85"
+	     mouse_opaque="true" name="object_name_text" v_pad="0" width="210">
 		...
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-72" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="right" height="18" hidden="false"
-	     left="5" mouse_opaque="true" name="fastpay text" v_pad="0" width="75">
+	     font="SansSerif" h_pad="0" halign="right" height="18" left="5"
+	     mouse_opaque="true" name="fastpay text" v_pad="0" width="75">
 		Fast Pay:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="right" height="18" hidden="false"
-	     left="5" mouse_opaque="true" name="amount text" v_pad="0" width="75">
+	     font="SansSerif" h_pad="0" halign="right" height="18" left="5"
+	     mouse_opaque="true" name="amount text" v_pad="0" width="75">
 		Amount:
 	</text>
 	<button bottom="-74" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="L$1" label_selected="L$1" left="85"
-	     mouse_opaque="true" name="fastpay 1" scale_image="true" width="80" />
+	     label="L$1" label_selected="L$1" left="85" mouse_opaque="true"
+	     name="fastpay 1" scale_image="true" width="80" />
 	<button bottom="-74" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="L$5" label_selected="L$5" left="170"
-	     mouse_opaque="true" name="fastpay 5" scale_image="true" width="80" />
+	     label="L$5" label_selected="L$5" left="170" mouse_opaque="true"
+	     name="fastpay 5" scale_image="true" width="80" />
 	<button bottom="-98" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="L$10" label_selected="L$10" left="85"
-	     mouse_opaque="true" name="fastpay 10" scale_image="true" width="80" />
+	     label="L$10" label_selected="L$10" left="85" mouse_opaque="true"
+	     name="fastpay 10" scale_image="true" width="80" />
 	<button bottom="-98" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="L$20" label_selected="L$20" left="170"
-	     mouse_opaque="true" name="fastpay 20" scale_image="true" width="80" />
+	     label="L$20" label_selected="L$20" left="170" mouse_opaque="true"
+	     name="fastpay 20" scale_image="true" width="80" />
 	<button bottom="-132" enabled="false" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Pay" label_selected="Pay"
-	     left="140" mouse_opaque="true" name="pay btn" scale_image="true" width="70" />
+	     halign="center" height="20" label="Pay" label_selected="Pay" left="140"
+	     mouse_opaque="true" name="pay btn" scale_image="true" width="70" />
 	<button bottom="-132" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Cancel"
-	     label_selected="Cancel" left="215" mouse_opaque="true" name="cancel btn"
-	     scale_image="true" width="70" />
+	     halign="center" height="20" label="Cancel" label_selected="Cancel"
+	     left="215" mouse_opaque="true" name="cancel btn" scale_image="true"
+	     width="70" />
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-130"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="18" hidden="false" left="85"
-	     max_length="9" mouse_opaque="true" name="amount"
-	     select_all_on_focus_received="false" select_on_focus="false" width="50" />
+	     handle_edit_keys_directly="false" height="18" left="85" max_length="9"
+	     mouse_opaque="true" name="amount" select_all_on_focus_received="false"
+	     select_on_focus="false" width="50" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_post_process.xml b/linden/indra/newview/skins/xui/en-us/floater_post_process.xml
new file mode 100644
index 0000000..0eb8150
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_post_process.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-350" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="400" hidden="false" left="50" min_height="400"
+     min_width="300" mouse_opaque="true" name="Post-Process Floater"
+     title="Post-Process Settings" width="400">
+	<tab_container bottom="-400" follows="left|top" height="400" hidden="false" left="0"
+	     mouse_opaque="false" name="Post-Process Tabs" tab_position="top"
+	     width="400">
+		<panel border="true" bottom="-400" follows="left|top|right|bottom" height="400"
+		     hidden="false" label="Color Filter" left="1" mouse_opaque="false"
+		     name="wmiColorFilterPanel" width="398">
+			<check_box bottom="-20" control_name="wmiColorFilterToggle" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+			     left="14" mouse_opaque="true" name="wmiColorFilterToggle" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+			     left="10" mouse_opaque="true" name="wmiColorFilterBrightnessText" v_pad="0"
+			     width="355">
+				Brightness
+			</text>
+			<slider bottom_delta="-30" can_edit_text="false"
+			     control_name="wmiColorFilterBrightness" decimal_digits="2" follows="left"
+			     height="10" increment="0.01" initial_val="1.0" label="" left="14"
+			     max_val="4" min_val="0" mouse_opaque="true" name="wmiColorFilterBrightness"
+			     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_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+			     left="10" mouse_opaque="true" name="wmiColorFilterSaturationText" v_pad="0"
+			     width="355">
+				Saturation
+			</text>
+			<slider bottom_delta="-30" can_edit_text="false"
+			     control_name="wmiColorFilterSaturation" decimal_digits="2" follows="left"
+			     height="10" increment="0.01" initial_val="1.0" label="" left="14"
+			     max_val="2" min_val="-1" mouse_opaque="true"
+			     name="wmiColorFilterSaturation" 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_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+			     left="10" mouse_opaque="true" name="wmiColorFilterContrastText" v_pad="0"
+			     width="355">
+				Contrast
+			</text>
+			<slider bottom_delta="-30" can_edit_text="false" control_name="wmiColorFilterContrast"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="14" max_val="4" min_val="0"
+			     mouse_opaque="true" name="wmiColorFilterContrast" 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_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+			     left="10" mouse_opaque="true" name="wmiColorFilterBaseText" v_pad="0"
+			     width="355">
+				Contrast Base Color
+			</text>
+			<slider bottom_delta="-30" can_edit_text="false" control_name="wmiColorFilterBaseR"
+			     decimal_digits="3" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="R" left="14" max_val="1" min_val="0"
+			     mouse_opaque="true" name="wmiColorFilterBaseR" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-20" can_edit_text="false" control_name="wmiColorFilterBaseG"
+			     decimal_digits="3" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="G" left="14" max_val="1" min_val="0"
+			     mouse_opaque="true" name="wmiColorFilterBaseG" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-20" can_edit_text="false" control_name="wmiColorFilterBaseB"
+			     decimal_digits="3" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="B" left="14" max_val="1" min_val="0"
+			     mouse_opaque="true" name="wmiColorFilterBaseB" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-20" can_edit_text="false" control_name="wmiColorFilterBaseI"
+			     decimal_digits="3" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="I" left="14" max_val="1" min_val="0"
+			     mouse_opaque="true" name="wmiColorFilterBaseI" show_text="true" value="1.0"
+			     width="200" />
+		</panel>
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
+		     hidden="false" label="Night Vision" left="1" mouse_opaque="false"
+		     name="wmiNightVisionPanel" width="398">
+			<check_box bottom="-20" control_name="wmiNightVisionToggle" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+			     left="14" mouse_opaque="true" name="wmiNightVisionToggle" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+			     left="10" mouse_opaque="true" name="wmiNightVisionBrightMultText" v_pad="0"
+			     width="355">
+				Light Amplification Multiple
+			</text>
+			<slider bottom_delta="-30" can_edit_text="false"
+			     control_name="wmiNightVisionBrightMult" decimal_digits="3" follows="left"
+			     height="10" increment="0.01" initial_val="3.0" label="" left="14"
+			     max_val="10" min_val="1" mouse_opaque="true"
+			     name="wmiNightVisionBrightMult" 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_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+			     left="10" mouse_opaque="true" name="wmiNightVisionNoiseSizeText" v_pad="0"
+			     width="355">
+				Noise Size
+			</text>
+			<slider bottom_delta="-30" can_edit_text="false" control_name="wmiNightVisionNoiseSize"
+			     decimal_digits="3" follows="left" height="10" increment="0.1"
+			     initial_val="1" label="" left="14" max_val="100" min_val="1"
+			     mouse_opaque="true" name="wmiNightVisionNoiseSize" 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_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+			     left="10" mouse_opaque="true" name="wmiNightVisionNoiseStrengthText"
+			     v_pad="0" width="355">
+				Noise Strength
+			</text>
+			<slider bottom_delta="-30" can_edit_text="false"
+			     control_name="wmiNightVisionNoiseStrength" decimal_digits="3"
+			     follows="left" height="10" increment="0.01" initial_val="0.3" label=""
+			     left="14" max_val="1" min_val="0" mouse_opaque="true"
+			     name="wmiNightVisionNoiseStrength" show_text="true" value="1.0" width="200" />
+		</panel>
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
+		     hidden="false" label="Bloom" left="1" mouse_opaque="true"
+		     name="wmiBloomPanel" width="398">
+			<check_box bottom="-20" control_name="wmiBloomToggle" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+			     left="14" mouse_opaque="true" name="wmiBloomToggle" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+			     left="10" mouse_opaque="true" name="wmiBloomExtractText" v_pad="0"
+			     width="355">
+				Luminosity Extraction
+			</text>
+			<slider bottom_delta="-30" can_edit_text="false" control_name="wmiBloomExtract"
+			     decimal_digits="3" follows="left" height="10" increment="0.01"
+			     initial_val="0.9" label="" left="14" max_val="1" min_val="0"
+			     mouse_opaque="true" name="wmiBloomExtract" 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_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+			     left="10" mouse_opaque="true" name="wmiBloomSizeText" v_pad="0" width="355">
+				Bloom Size
+			</text>
+			<slider bottom_delta="-30" can_edit_text="false" control_name="wmiBloomSize"
+			     decimal_digits="3" follows="left" height="10" increment="0.01"
+			     initial_val="3.0" label="" left="14" max_val="20" min_val="0"
+			     mouse_opaque="true" name="wmiBloomSize" 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_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+			     left="10" mouse_opaque="true" name="wmiBloomStrengthText" v_pad="0"
+			     width="355">
+				Bloom Strength
+			</text>
+			<slider bottom_delta="-30" can_edit_text="false" control_name="wmiBloomStrength"
+			     decimal_digits="3" follows="left" height="10" increment="0.01"
+			     initial_val="1.2" label="" left="14" max_val="10" min_val="0"
+			     mouse_opaque="true" name="wmiBloomStrength" show_text="true" value="1.0"
+			     width="200" />
+		</panel>
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
+		     hidden="false" label="Extras" left="1" mouse_opaque="false" name="Extras"
+		     width="398">
+			<button bottom="-33" enabled="true" font="SansSerif" halign="center" height="20"
+			     hidden="false" label="LoadEffect" label_selected="LoadEffect" left="15"
+			     mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
+			<button bottom="-60" enabled="true" font="SansSerif" halign="center" height="20"
+			     hidden="false" label="SaveEffect" label_selected="SaveEffect" left="15"
+			     mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
+			<combo_box allow_text_entry="false" bottom="-33" follows="left|top" height="18"
+			     left_delta="120" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
+			     width="150" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-75"
+			     enabled="true" follows="left|right|bottom" font="SansSerif"
+			     handle_edit_keys_directly="false" height="20" hidden="false"
+			     label="Effect Name" left="135" max_length="40" mouse_opaque="true"
+			     name="PPEffectNameEditor" select_all_on_focus_received="false"
+			     select_on_focus="false" tab_group="1" width="150" />
+		</panel>
+	</tab_container>
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/xui/en-us/floater_postcard.xml
index af13e27..e688ae3 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_postcard.xml
@@ -23,38 +23,29 @@
 	     name="subject_label">
 		Subject:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" label="Type your subject here." 
-		left="120" max_length="100" name="subject_form" width="150"  />
+	<line_editor bottom_delta="-6" follows="left|top" height="20"
+	     label="Type your subject here." left="120" max_length="100"
+	     name="subject_form" width="150" />
 	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
 	     name="msg_label">
 		Message:
 	</text>
-	<text_editor bottom_delta="-150" follows="left|top|right|bottom" height="140"
-		 left="12" max_length="700" name="msg_form" width="420">Type your message here.</text_editor>
-	<check_box bottom_delta="-20" follows="left|bottom" height="18" label="Publish on the web"
-	     left="10" name="allow_publish_check"
-	     tool_tip="Publish this postcard on the web." />
-	<check_box bottom_delta="0" follows="left|bottom" height="18" label="Mature content"
-	     left="160" name="mature_check"
-	     tool_tip="This postcard contains mature content." />
-	<button bottom_delta="-1" follows="left|bottom" height="20" label="?" left="280"
-	     name="publish_help_btn" width="20" />
-	<text bottom_delta="-16" follows="left|bottom" font="SansSerifSmall" left="12"
+	<text_editor bottom_delta="-150" follows="left|top|right|bottom" height="140" left="12"
+	     max_length="700" name="msg_form" width="420">
+		Type your message here.
+	</text_editor>
+	<text bottom_delta="-37" follows="left|bottom" font="SansSerifSmall" left="12"
 	     name="fine_print">
 		If your postcard recipient joins SL, you&apos;ll get a referral bonus.
 	</text>
-	<!--button bottom_delta="-32" follows="right|bottom" height="20" label="Cancel" left="125"
-	     name="cancel_btn" width="150" />
-	<button bottom_delta="0" follows="right|bottom" height="20" label="Send" left="285"
-	     name="send_btn" width="150" /-->
-        <button bottom_delta="-32" follows="right|bottom" height="20" label="Cancel" right="-10"
-	     name="cancel_btn" width="100" />
-        <button bottom_delta="0" follows="right|bottom" height="20" label="Send" left_delta="-106"
-	     name="send_btn" width="100" />
-
-
-	     
-	<text hidden="true" name="default_subject"> Postcard from Second Life. </text>
-	<text hidden="true" name="default_message"> Check this out! </text>
-
+	<button bottom_delta="-32" follows="right|bottom" height="20" label="Cancel"
+	     name="cancel_btn" right="-10" width="100" />
+	<button bottom_delta="0" follows="right|bottom" height="20" label="Send"
+	     left_delta="-106" name="send_btn" width="100" />
+	<string name="default_subject">
+		Postcard from Second Life.
+	</string>
+	<string name="default_message">
+		Check this out!
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preferences.xml b/linden/indra/newview/skins/xui/en-us/floater_preferences.xml
index efb812b..81168be 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preferences.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preferences.xml
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-666" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" can_tear_off="true" enabled="true" height="460"
-     hidden="false" left="330" min_height="213" min_width="324" default_tab_group="1"
+     can_resize="false" can_tear_off="true" default_tab_group="1" enabled="true"
+     height="460" left="330" min_height="213" min_width="324"
      mouse_opaque="true" name="Preferences" title="Preferences" width="620">
-
 	<button bottom="-455" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="OK" label_selected="OK"
-	     left="335" mouse_opaque="true" name="OK" scale_image="true" width="90" />
+	     halign="center" height="20" label="OK" label_selected="OK" left="335"
+	     mouse_opaque="true" name="OK" scale_image="true" width="90" />
 	<button bottom="-455" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Cancel"
-	     label_selected="Cancel" left_delta="93" mouse_opaque="true" name="Cancel"
-	     scale_image="true" width="90" />
+	     halign="center" height="20" label="Cancel" label_selected="Cancel"
+	     left_delta="93" mouse_opaque="true" name="Cancel" scale_image="true"
+	     width="90" />
 	<button bottom="-455" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Apply"
-	     label_selected="Apply" left_delta="93" mouse_opaque="true" name="Apply"
-	     scale_image="true" width="90" />
-
+	     halign="center" height="20" label="Apply" label_selected="Apply"
+	     left_delta="93" mouse_opaque="true" name="Apply" scale_image="true"
+	     width="90" />
 	<button bottom="-455" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="About"
-	     label_selected="About" left="9" mouse_opaque="true" name="About..."
-	     scale_image="true" width="90" />
+	     halign="center" height="20" label="About" label_selected="About" left="9"
+	     mouse_opaque="true" name="About..." scale_image="true" width="90" />
 	<button bottom="-455" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Help"
-	     label_selected="Help" left_delta="93" mouse_opaque="true" name="Help"
-	     scale_image="true" width="90"
-	     help_url="http://secondlife.com/app/help/technical/preferences.php" />
-
+	     halign="center" height="20"
+	     help_url="http://secondlife.com/app/help/technical/preferences.php"
+	     label="Help" label_selected="Help" left_delta="93" mouse_opaque="true"
+	     name="Help" scale_image="true" width="90" />
 	<tab_container bottom="-431" enabled="true" follows="left|top|right|bottom" height="410"
-	     hidden="false" left="0" mouse_opaque="false" name="pref core"
-	     tab_group="1" tab_position="left" tab_width="120" width="620" />
+	     left="0" mouse_opaque="false" name="pref core" tab_group="1"
+	     tab_position="left" tab_width="120" width="620" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_animation.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_animation.xml
index bc4b295..657898a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_animation.xml
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-366" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="85" hidden="false" left="239"
-     min_height="0" min_width="0" mouse_opaque="true" name="preview_anim"
-     width="300">
+     can_resize="false" enabled="true" height="85" left="239" min_height="0"
+     min_width="0" mouse_opaque="true" name="preview_anim" width="300">
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" hidden="false" left="93"
-	     max_length="127" mouse_opaque="true" name="desc"
-	     select_all_on_focus_received="false" select_on_focus="false" width="194" />
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="194" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" hidden="false"
-	     left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
 		Description:
 	</text>
 	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     hidden="false" label="Play in World" label_selected="Stop" left="27"
-	     mouse_opaque="true" name="Anim play btn" scale_image="true"
+	     label="Play in World" label_selected="Stop" left="27" mouse_opaque="true"
+	     name="Anim play btn" scale_image="true"
 	     tool_tip="Play this animation so that others can see it." width="96" />
 	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     hidden="false" label="Play Locally" label_selected="Stop" left="177"
-	     mouse_opaque="true" name="Anim audition btn" scale_image="true"
+	     label="Play Locally" label_selected="Stop" left="177" mouse_opaque="true"
+	     name="Anim audition btn" scale_image="true"
 	     tool_tip="Play this animation so that only you can see it." width="96" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_classified.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_classified.xml
index 5a6e739..3b116b3 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_classified.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="510" hidden="false" left="242"
-     min_height="480" min_width="450" mouse_opaque="true"
-     name="classified_preview" width="440" title="Classified Information" rect_control="PreviewClassifiedRect">
-  <panel follows="bottom|left" bottom="20" height="470" left="0" name="classified_details_panel" width="440" />
-
+     can_resize="false" enabled="true" height="510" left="242" min_height="480"
+     min_width="450" mouse_opaque="true" name="classified_preview"
+     rect_control="PreviewClassifiedRect" title="Classified Information"
+     width="440">
+	<panel bottom="20" follows="bottom|left" height="470" left="0"
+	     name="classified_details_panel" width="440" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_embedded_texture.xml
index ed1c5e3..a213044 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_embedded_texture.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="331" hidden="false" left="201"
-     min_height="120" min_width="300" mouse_opaque="true" name="preview_texture"
-     width="300">
+     can_resize="true" enabled="true" height="331" left="201" min_height="120"
+     min_width="300" mouse_opaque="true" name="preview_texture" width="300">
 	<button bottom="-325" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Copy To Inventory"
-	     left="105" mouse_opaque="true" name="Copy To Inventory" scale_image="true"
-	     width="170" />
+	     halign="center" height="20" label="Copy To Inventory" left="105"
+	     mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-	     left="13" mouse_opaque="true" name="dimensions" v_pad="0" width="163">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
+	     mouse_opaque="true" name="dimensions" v_pad="0" width="163">
 		Dimensions: [WIDTH] x [HEIGHT]
 	</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_event.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_event.xml
index 2eaebfe..8aab467 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_event.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_event.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="510" hidden="false" left="242"
-     min_height="480" min_width="450" mouse_opaque="true"
-     name="event_preview" width="440" title="Event Information" rect_control="PreviewEventRect">
-  <panel follows="bottom|left" bottom="20" height="470" left="0" name="event_details_panel" width="440" />
-
+     can_resize="false" enabled="true" height="510" left="242" min_height="480"
+     min_width="450" mouse_opaque="true" name="event_preview"
+     rect_control="PreviewEventRect" title="Event Information" width="440">
+	<panel bottom="20" follows="bottom|left" height="470" left="0"
+	     name="event_details_panel" width="440" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml
index cbf5da4..efe3aca 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="495" hidden="false" left="242"
-     min_height="510" min_width="460" mouse_opaque="true"
-     name="existing_landmark_preview" width="440">
-  <panel follows="bottom|left" bottom="0" height="475" left="0" name="place_details_panel" width="440" />
-
+     can_resize="false" enabled="true" height="495" left="242" min_height="510"
+     min_width="460" mouse_opaque="true" name="existing_landmark_preview"
+     width="440">
+	<panel bottom="0" follows="bottom|left" height="475" left="0"
+	     name="place_details_panel" width="440" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
index 84aacad..ef4da1d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
@@ -2,6 +2,19 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" height="350" min_height="350" min_width="450"
      name="gesture_preview" width="450">
+	<string name="step_anim" />
+	<string name="step_sound" />
+	<string name="step_chat" />
+	<string name="step_wait" />
+	<string name="stop_txt">
+		Stop
+	</string>
+	<string name="preview_txt">
+		Preview
+	</string>
+	<string name="none_text">
+		-- None --
+	</string>
 	<text bottom="-35" follows="top|left" font="SansSerif" left="16" name="desc_label">
 		Description:
 	</text>
@@ -92,9 +105,4 @@ unless you add wait steps.
 	     name="preview_btn" width="80" />
 	<button bottom="5" follows="top|left" height="20" label="Save" left_delta="90"
 	     name="save_btn" width="80" />
-	<text hidden="true" name="none_text">
-		-- None --
-	</text>
-	<text hidden="true" name="stop_txt">Stop</text>
-	<text hidden="true" name="preview_txt">Preview</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml
index 16d0dcd..7b3316e 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml
@@ -1,31 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-97" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="90" hidden="false" left="201"
-     min_height="370" min_width="90" mouse_opaque="true" name="landmark_preview"
-     width="370">
+     can_resize="false" enabled="true" height="90" left="201" min_height="370"
+     min_width="90" mouse_opaque="true" name="landmark_preview" width="370">
 	<button bottom="-77" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Teleport" label_selected="" left="13"
-	     mouse_opaque="true" name="Teleport btn" width="100" />
+	     label="Teleport" label_selected="" left="13" mouse_opaque="true"
+	     name="Teleport btn" width="100" />
 	<button bottom="-77" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Show on Map"
-	     label_selected="" left="126" mouse_opaque="true" name="Show on Map btn"
-	     width="100" />
+	     halign="center" height="20" label="Show on Map" label_selected=""
+	     left="126" mouse_opaque="true" name="Show on Map btn" width="100" />
 	<button bottom="-77" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Discard"
-	     label_selected="" left="239" mouse_opaque="true" name="Discard btn"
-	     width="100" />
+	     halign="center" height="20" label="Discard" label_selected="" left="239"
+	     mouse_opaque="true" name="Discard btn" width="100" />
 	<icon bottom="-21" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-	     hidden="false" image_name="inv_item_landmark_visited.tga" left="5"
-	     mouse_opaque="true" name="icon_landmark" width="16" />
+	     image_name="inv_item_landmark_visited.tga" left="5" mouse_opaque="true"
+	     name="icon_landmark" width="16" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" hidden="false"
-	     left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
 		Description:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" hidden="false" left="93"
-	     max_length="127" mouse_opaque="true" name="desc"
-	     select_all_on_focus_received="false" select_on_focus="false" width="264" />
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="264" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_notecard.xml
index 14b97ef..03fc7f6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_notecard.xml
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" follows="left|top" height="361"
-     hidden="false" left="273" min_height="243" min_width="234"
-     mouse_opaque="true" name="preview notecard" title="Note:" width="400">
+     can_resize="true" enabled="true" follows="left|top" height="361" left="273"
+     min_height="243" min_width="234" mouse_opaque="true"
+     name="preview notecard" title="Note:" width="400">
 	<button bottom="-352" enabled="false" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Save"
-	     label_selected="Save" left="9" mouse_opaque="false" name="Save"
-	     scale_image="true" width="100" />
+	     halign="center" height="20" label="Save" label_selected="Save" left="9"
+	     mouse_opaque="false" name="Save" scale_image="true" width="100" />
 	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
-	     hidden="false" image_name="icon_lock.tga" left="344" mouse_opaque="true"
-	     name="lock" width="16" />
+	     image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock"
+	     width="16" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" hidden="false"
-	     left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
 		Description:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" hidden="false" left="93"
-	     max_length="127" mouse_opaque="true" name="desc"
-	     select_all_on_focus_received="false" select_on_focus="false" width="294" />
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="294" />
 	<text_editor type="string" length="1" bottom="-327" embedded_items="true" enabled="true"
 	     follows="left|top|right|bottom" font="SansSerif" height="281"
-	     hidden="false" ignore_tab="false" left="4" max_length="65536"
-	     mouse_opaque="true" name="Notecard Editor" width="392" word_wrap="true">
-Loading...
+	     ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
+	     name="Notecard Editor" width="392" word_wrap="true">
+		Loading...
 	</text_editor>
-	<text hidden="true" name="no_object">Unable to find object containing this note.</text>
-	<text hidden="true" name="not_allowed">You are not allowed to view this note.</text>
+	<string name="no_object">
+		Unable to find object containing this note.
+	</string>
+	<string name="not_allowed">
+		You are not allowed to view this note.
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml
index aabc689..796ef20 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-484" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="400" hidden="false" left="138"
-     min_height="243" min_width="234" mouse_opaque="true"
-     name="preview_notecard" width="400">
+     can_resize="true" enabled="true" height="400" left="138" min_height="243"
+     min_width="234" mouse_opaque="true" name="preview_notecard" width="400">
 	<text_editor type="string" length="1" bg_readonly_color="0.392157 0.392157 0.392157 1" bottom="-366"
 	     embedded_items="true" enabled="true" follows="left|top|right|bottom"
-	     font="SansSerif" height="320" hidden="false" ignore_tab="false" left="4"
+	     font="SansSerif" height="320" ignore_tab="false" left="4"
 	     max_length="65536" mouse_opaque="true" name="Notecard Editor" width="392"
 	     word_wrap="true">
 		Loading...
 	</text_editor>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" hidden="false"
-	     left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
 		Description:
 	</text>
 	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
-	     hidden="false" image_name="icon_lock.tga" left="344" mouse_opaque="true"
-	     name="lock" width="16" />
+	     image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock"
+	     width="16" />
 	<button bottom="-391" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Keep"
-	     label_selected="Keep" left="9" mouse_opaque="true" name="Keep"
-	     scale_image="true" width="100" />
+	     halign="center" height="20" label="Keep" label_selected="Keep" left="9"
+	     mouse_opaque="true" name="Keep" scale_image="true" width="100" />
 	<button bottom="-391" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Discard"
-	     label_selected="Discard" left="114" mouse_opaque="true" name="Discard"
-	     scale_image="true" width="100" />
+	     halign="center" height="20" label="Discard" label_selected="Discard"
+	     left="114" mouse_opaque="true" name="Discard" scale_image="true"
+	     width="100" />
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" hidden="false" left="93"
-	     max_length="127" mouse_opaque="true" name="desc"
-	     select_all_on_focus_received="false" select_on_focus="false" width="294" />
-	<text hidden="true" name="no_object">Unable to find object containing this note.:</text>
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="294" />
+	<string name="no_object">
+		Unable to find object containing this note.:
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_sound.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_sound.xml
index 0eaa754..9ac36d3 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_sound.xml
@@ -1,38 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-85" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="85" hidden="false" left="176"
-     min_height="0" min_width="0" mouse_opaque="true" name="preview_sound"
-     width="300">
+     can_resize="false" enabled="true" height="85" left="176" min_height="0"
+     min_width="0" mouse_opaque="true" name="preview_sound" width="300">
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" hidden="false" left="95"
-	     max_length="127" mouse_opaque="true" name="desc"
-	     select_all_on_focus_received="false" select_on_focus="false" width="192" />
+	     handle_edit_keys_directly="false" height="19" left="95" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="192" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" hidden="false"
-	     left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
 		Description:
 	</text>
-        <button bottom="-70" enabled="true" font="SansSerif" halign="center" height="19"
-	     hidden="false" label="Play Locally" label_selected="Play Locally"
-	     left="168" mouse_opaque="true" name="Sound audition btn" scale_image="true"
+	<button bottom="-70" enabled="true" font="SansSerif" halign="center" height="19"
+	     label="Play Locally" label_selected="Play Locally" left="168"
+	     mouse_opaque="true" name="Sound audition btn" scale_image="true"
 	     sound_flags="0" tool_tip="Play this sound so that only you can hear it."
 	     width="120" />
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="19"
-	     hidden="false" label="Play in World" label_selected="Play in World"
-	     left_delta="-126" mouse_opaque="true" name="Sound play btn" scale_image="true"
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="19"
+	     label="Play in World" label_selected="Play in World" left_delta="-126"
+	     mouse_opaque="true" name="Sound play btn" scale_image="true"
 	     sound_flags="0" tool_tip="Play this sound so that others can hear it."
 	     width="120" />
-
-	<!--button bottom="-82" enabled="true" font="SansSerif" halign="center" height="19"
-	     hidden="false" label="Play in World" label_selected="Play in World"
-	     left="168" mouse_opaque="true" name="Sound play btn" scale_image="true"
-	     sound_flags="0" tool_tip="Play this sound so that others can hear it."
-	     width="120" />
-	<button bottom="-60" enabled="true" font="SansSerif" halign="center" height="19"
-	     hidden="false" label="Play Locally" label_selected="Play Locally"
-	     left="168" mouse_opaque="true" name="Sound audition btn" scale_image="true"
-	     sound_flags="0" tool_tip="Play this sound so that only you can hear it."
-	     width="120" /-->
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_texture.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_texture.xml
index 60d1bd7..f52b1b6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_texture.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" enabled="true" follows="left|bottom" height="324"
-     hidden="false" left="300" min_height="120" min_width="300"
-     mouse_opaque="true" name="preview_texture" width="335">
+     left="300" min_height="120" min_width="300" mouse_opaque="true"
+     name="preview_texture" width="335">
 	<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="SansSerif" h_pad="0" halign="left" height="19" hidden="false"
-	     left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
 		Description:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" hidden="false" left="93"
-	     max_length="127" mouse_opaque="true" name="desc"
-	     select_all_on_focus_received="false" select_on_focus="false" width="229" />
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="229" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="10" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-	     left="13" mouse_opaque="true" name="dimensions" v_pad="0" width="163">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
+	     mouse_opaque="true" name="dimensions" v_pad="0" width="163">
 		Dimensions: [WIDTH] x [HEIGHT]
 	</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_texture_keep_discard.xml
index 546249d..3c4a44d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_texture_keep_discard.xml
@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="331" hidden="false" left="176"
-     min_height="120" min_width="300" mouse_opaque="true" name="preview_texture"
-     width="300">
+     can_resize="true" enabled="true" height="331" left="176" min_height="120"
+     min_width="300" mouse_opaque="true" name="preview_texture" width="300">
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" hidden="false"
-	     left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
 		Description:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" hidden="false" left="93"
-	     max_length="127" mouse_opaque="true" name="desc"
-	     select_all_on_focus_received="false" select_on_focus="false" width="194" />
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="194" />
 	<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Keep"
-	     label_selected="Keep" left="9" mouse_opaque="true" name="Keep"
-	     scale_image="true" width="100" />
+	     halign="center" height="20" label="Keep" label_selected="Keep" left="9"
+	     mouse_opaque="true" name="Keep" scale_image="true" width="100" />
 	<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Discard"
-	     label_selected="Discard" left="114" mouse_opaque="true" name="Discard"
-	     scale_image="true" width="100" />
+	     halign="center" height="20" label="Discard" label_selected="Discard"
+	     left="114" mouse_opaque="true" name="Discard" scale_image="true"
+	     width="100" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-	     left="13" mouse_opaque="true" name="dimensions" v_pad="0" width="163">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
+	     mouse_opaque="true" name="dimensions" v_pad="0" width="163">
 		Dimensions: [WIDTH] x [HEIGHT]
 	</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
index a59bc73..055a5fc 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="495" hidden="false"
-     mouse_opaque="true"
-     name="url_preview" width="440" title="Place Information" rect_control="PreviewURLRect">
-  <panel follows="bottom|left" bottom="0" height="475" left="0" name="place_details_panel" width="440" />
-
+     can_resize="false" enabled="true" height="495" mouse_opaque="true"
+     name="url_preview" rect_control="PreviewURLRect" title="Place Information"
+     width="440">
+	<panel bottom="0" follows="bottom|left" height="475" left="0"
+	     name="place_details_panel" width="440" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_price_for_listing.xml b/linden/indra/newview/skins/xui/en-us/floater_price_for_listing.xml
index 23733df..0e4123c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_price_for_listing.xml
@@ -18,12 +18,8 @@ and appear higher in searches.
 	</text>
 	<line_editor bottom_delta="2" follows="top|left" height="20" left="125" max_length="6"
 	     name="price_edit" width="60" />
-            <button bottom="13" follows="top|left" height="20" label="Cancel" left="205"
+	<button bottom="13" follows="top|left" height="20" label="Cancel" left="205"
 	     name="cancel_btn" width="100" />
-            <button bottom_delta="0" follows="top|left" height="20" label="Set Price" left_delta="-106"
-	     name="set_price_btn" width="100" />
-        <!--button bottom="30" follows="top|left" height="20" label="Set Price" left="200"
-	     name="set_price_btn" width="100" />
-	<button bottom_delta="-25" follows="top|left" height="20" label="Cancel" left="200"
-	     name="cancel_btn" width="100" /-->
+	<button bottom_delta="0" follows="top|left" height="20" label="Set Price"
+	     left_delta="-106" name="set_price_btn" width="100" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_rate.xml b/linden/indra/newview/skins/xui/en-us/floater_rate.xml
index f6fb60b..8467e6d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_rate.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_rate.xml
@@ -1,84 +1,81 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-576" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="400" hidden="false" left="380"
-     min_height="100" min_width="100" mouse_opaque="true" name="rate"
+     can_resize="false" enabled="true" height="400" left="380" min_height="100"
+     min_width="100" mouse_opaque="true" name="rate"
      title="Your Rating of Jeska Linden" width="310">
 	<radio_group bottom="-96" draw_border="false" enabled="true" follows="left|top" height="54"
-	     hidden="false" left="32" mouse_opaque="true" name="behavior" width="110">
-		<radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="0" mouse_opaque="true" name="Positive" width="100">
+	     left="32" mouse_opaque="true" name="behavior" width="110">
+		<radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" left="0"
+		     mouse_opaque="true" name="Positive" width="100">
 			Positive
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="0" mouse_opaque="true" name="No Rating" width="100">
+		<radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" left="0"
+		     mouse_opaque="true" name="No Rating" width="100">
 			No Rating
 		</radio_item>
 	</radio_group>
 	<radio_group bottom="-186" draw_border="false" enabled="true" follows="left|top" height="54"
-	     hidden="false" left="32" mouse_opaque="true" name="appearance" width="110">
-		<radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="0" mouse_opaque="true" name="Positive" width="100">
+	     left="32" mouse_opaque="true" name="appearance" width="110">
+		<radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" left="0"
+		     mouse_opaque="true" name="Positive" width="100">
 			Positive
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="0" mouse_opaque="true" name="No Rating" width="100">
+		<radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" left="0"
+		     mouse_opaque="true" name="No Rating" width="100">
 			No Rating
 		</radio_item>
 	</radio_group>
 	<radio_group bottom="-276" draw_border="false" enabled="true" follows="left|top" height="54"
-	     hidden="false" left="32" mouse_opaque="true" name="building" width="110">
-		<radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="0" mouse_opaque="true" name="Positive" width="100">
+	     left="32" mouse_opaque="true" name="building" width="110">
+		<radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" left="0"
+		     mouse_opaque="true" name="Positive" width="100">
 			Positive
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="0" mouse_opaque="true" name="No Rating" width="100">
+		<radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" left="0"
+		     mouse_opaque="true" name="No Rating" width="100">
 			No Rating
 		</radio_item>
 	</radio_group>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-328"
 	     enabled="true" follows="left|top" font="SansSerifSmall"
-	     handle_edit_keys_directly="false" height="16" hidden="false" left="16"
-	     max_length="254" mouse_opaque="true" name="mesg editor"
-	     select_all_on_focus_received="false" select_on_focus="false" width="278" />
+	     handle_edit_keys_directly="false" height="16" left="16" max_length="254"
+	     mouse_opaque="true" name="mesg editor" select_all_on_focus_received="false"
+	     select_on_focus="false" width="278" />
 	<button bottom="-392" enabled="false" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="OK" label_selected="OK" left="134"
-	     mouse_opaque="true" name="OK" scale_image="true" width="72" />
+	     label="OK" label_selected="OK" left="134" mouse_opaque="true" name="OK"
+	     scale_image="true" width="72" />
 	<button bottom="-392" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Cancel" label_selected="Cancel" left="222"
-	     mouse_opaque="true" name="Cancel" scale_image="true" width="72" />
+	     label="Cancel" label_selected="Cancel" left="222" mouse_opaque="true"
+	     name="Cancel" scale_image="true" width="72" />
 	<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" hidden="false"
-	     left="16" mouse_opaque="true" name="Overall behavior:" v_pad="0"
-	     width="278">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="Overall behavior:" v_pad="0" width="278">
 		Overall behavior:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="16" mouse_opaque="true"
-	     name="Skill at appearance (clothing and attachments):" v_pad="0"
-	     width="278">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="Skill at appearance (clothing and attachments):"
+	     v_pad="0" width="278">
 		Skill at appearance (clothing and attachments):
 	</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" hidden="false"
-	     left="16" mouse_opaque="true" name="Skill at building:" v_pad="0"
-	     width="278">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="Skill at building:" v_pad="0" width="278">
 		Skill at building:
 	</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="16" hidden="false"
-	     left="16" mouse_opaque="true" name="Message:" v_pad="0" width="278">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="Message:" v_pad="0" width="278">
 		Message:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-362" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="16" mouse_opaque="true" name="cost" v_pad="0" width="278">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="cost" v_pad="0" width="278">
 		Cost: L$[COST] to change each rating.  Total charge: L$[TOTAL].
 	</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_region_info.xml b/linden/indra/newview/skins/xui/en-us/floater_region_info.xml
index 36f0989..b0ee0a2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_region_info.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_region_info.xml
@@ -1,5 +1,7 @@
-<floater can_close="true" can_minimize="true" can_resize="false" name="regioninfo" can_drag_on_left="false"
-     rect_control="FloaterRegionInfo" title="Region/Estate">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" name="regioninfo" rect_control="FloaterRegionInfo"
+     title="Region/Estate">
 	<tab_container border="false" bottom="0" follows="left|right|top|bottom" left="1"
 	     name="region_panels" right="-1" tab_position="top" top="-20" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
index 6600349..61aa835 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
@@ -2,14 +2,13 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" height="560" min_height="100" min_width="100"
      name="floater_report_abuse" title="Report Abuse" width="390">
-        <texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
-	     follows="left|top" height="114" left="238"
-	     mouse_opaque="true" name="screenshot" label="" width="134" />
-        <check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
+	<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
+	     follows="left|top" height="114" label="" left="238" mouse_opaque="true"
+	     name="screenshot" width="134" />
+	<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Include screenshot" left="234"
 	     mouse_opaque="true" name="screen_check" width="116" />
-
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-48" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
 	     mouse_opaque="true" name="reporter_title" v_pad="0" width="50">
@@ -19,7 +18,8 @@
 	     bottom="-48" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
 	     mouse_opaque="true" name="reporter_field" v_pad="0" width="150">
-            Loremipsum Dolorsitamut</text>
+		Loremipsum Dolorsitamut
+	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-64" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
@@ -30,7 +30,8 @@
 	     bottom="-64" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
 	     mouse_opaque="true" name="sim_field" v_pad="0" width="120">
-            Region Name</text>
+		Region Name
+	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-80" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
@@ -41,8 +42,8 @@
 	     bottom="-80" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
 	     mouse_opaque="true" name="pos_field" v_pad="0" width="120">
-            {128.1, 128.1, 15.4}</text>
-         
+		{128.1, 128.1, 15.4}
+	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
@@ -63,7 +64,8 @@
 	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
 	     mouse_opaque="true" name="object_name" v_pad="0" width="109">
-            Consetetur Sadipscing</text>
+		Consetetur Sadipscing
+	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
@@ -74,7 +76,8 @@
 	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
 	     mouse_opaque="true" name="owner_name" v_pad="0" width="109">
-            Hendrerit Vulputate</text>
+		Hendrerit Vulputate
+	</text>
 	<combo_box bottom_delta="-28" follows="left|top" height="20" left="16" mouse_opaque="true"
 	     name="category_combo"
 	     tool_tip="Category -- select the category that best describes this report"
@@ -107,7 +110,6 @@
 			Other
 		</combo_item>
 	</combo_box>
-     
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
@@ -119,8 +121,9 @@
 	     font="SansSerifSmall" height="16" left="16" max_length="32"
 	     mouse_opaque="true" name="abuser_name_edit"
 	     text_readonly_color="1, 1, 1, 1" width="180" />
-	<button bottom_delta="-2" font="SansSerif" halign="center" height="20" label="Choose Resident"
-	     label_selected="" left_delta="190" mouse_opaque="true" name="select_abuser"
+	<button bottom_delta="-2" font="SansSerif" halign="center" height="20"
+	     label="Choose Resident" label_selected="" left_delta="190"
+	     mouse_opaque="true" name="select_abuser"
 	     tool_tip="Select the name of the abuser from a list" width="160" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
@@ -154,7 +157,7 @@
 	     bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="48" left="70"
 	     mouse_opaque="true" name="bug_aviso" v_pad="0" width="308">
-Please be specific about the date, location, nature of
+		Please be specific about the date, location, nature of
 abuse, relevant chat/IM text, and select the object
 if possible.
 	</text>
@@ -168,13 +171,10 @@ if possible.
 	     mouse_opaque="true" name="incomplete_title" v_pad="0" width="342">
 		Note: Incomplete reports will not be investigated.
 	</text>
-        <!-- buttons lay out right to left! -->
 	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Cancel" label_selected="Cancel" right="380" mouse_opaque="true"
-	     name="cancel_btn" width="150" />
-        
-        	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Report Abuse" label_selected="Report Abuse" right="224" 
-	     mouse_opaque="true" name="send_btn" width="150" />
-
+	     label="Cancel" label_selected="Cancel" mouse_opaque="true"
+	     name="cancel_btn" right="380" width="150" />
+	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
+	     label="Report Abuse" label_selected="Report Abuse" mouse_opaque="true"
+	     name="send_btn" right="224" width="150" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml b/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
index e86d1a7..4583137 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
@@ -2,16 +2,16 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" height="455" min_height="100" min_width="100"
      name="bug_reporter" title="Report Bug" width="390">
-    <texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
-        follows="left|top" height="114" left="238"
-	    mouse_opaque="true" name="screenshot" label="" width="134" />
-    <check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
+	<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
+	     follows="left|top" height="114" label="" left="238" mouse_opaque="true"
+	     name="screenshot" width="134" />
+	<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Include screenshot" left="234"
 	     mouse_opaque="true" name="screen_check" width="116" />
-    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	    bottom="-48" drop_shadow_visible="true" follows="left|top"
-            font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	    mouse_opaque="true" name="reporter_title" v_pad="0" width="50">
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-48" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="reporter_title" v_pad="0" width="50">
 		Reporter:
 	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -58,7 +58,8 @@
 	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
 	     mouse_opaque="true" name="object_name" v_pad="0" width="109">
-            Consetetur Sadipscing</text>
+		Consetetur Sadipscing
+	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
@@ -69,7 +70,8 @@
 	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
 	     mouse_opaque="true" name="owner_name" v_pad="0" width="109">
-            Hendrerit Vulputate</text>
+		Hendrerit Vulputate
+	</text>
 	<combo_box bottom_delta="-28" follows="left|top" height="20" left="16" mouse_opaque="true"
 	     name="category_combo"
 	     tool_tip="Category -- select the category that best describes this report"
@@ -149,29 +151,26 @@
 	<text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-112" embedded_items="false"
 	     follows="left|top" font="SansSerifSmall" height="112" left="16"
 	     max_length="900" mouse_opaque="false" name="details_edit"
-	     text_readonly_color="1, 1, 1, 1" width="356" word_wrap="true">Steps to reproduce the bug:
+	     text_readonly_color="1, 1, 1, 1" width="356" word_wrap="true">
+		Steps to reproduce the bug:
 
 Observed results:
 
 Expected results:
-    </text_editor>
+	</text_editor>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-40" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="32" left="16"
 	     mouse_opaque="true" name="bug_aviso" v_pad="0" width="342">
-Note: Incomplete reports will not be investigated
+		Note: Incomplete reports will not be investigated
 If this bug allows you to do something you should not be able 
 to do, especially if it impacts performance or security, please 
 select the &apos;Exploit&apos; category. Thank you!
 	</text>
-        
-        <!-- buttons lay out right to left! -->
 	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Cancel" label_selected="Cancel" right="380" mouse_opaque="true"
-	     name="cancel_btn" width="150" />
-        
-        	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Report Bug" label_selected="Report Bug" right="224" 
-	     mouse_opaque="true" name="send_btn" width="150" />
-
+	     label="Cancel" label_selected="Cancel" mouse_opaque="true"
+	     name="cancel_btn" right="380" width="150" />
+	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
+	     label="Report Bug" label_selected="Report Bug" mouse_opaque="true"
+	     name="send_btn" right="224" width="150" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_debug.xml b/linden/indra/newview/skins/xui/en-us/floater_script_debug.xml
index 8a61b00..f9d555d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_script_debug.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater bottom="-463" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="233" hidden="false" left="337" min_height="100"
-     min_width="100" mouse_opaque="true" name="script debug floater"
+     can_resize="true" height="233" left="337" min_height="100" min_width="100"
+     mouse_opaque="true" name="script debug floater"
      rect_control="FloaterScriptDebugRect" title="Script Errors/Warning"
      width="450">
 	<tab_container border="false" bottom="-233" follows="left|top|right|bottom" height="217"
-	     hidden="false" left="1" mouse_opaque="false" name="Preview Tabs"
-	     tab_position="bottom" width="448">
+	     left="1" mouse_opaque="false" name="Preview Tabs" tab_position="bottom"
+	     width="448">
 		<floater bottom="-202" can_close="false" can_drag_on_left="false" can_minimize="true"
 		     can_resize="false" follows="left|top|right|bottom" height="201"
-		     hidden="false" label="Script" left="1" min_height="100" min_width="100"
+		     label="Script" left="1" min_height="100" min_width="100"
 		     mouse_opaque="true" name="all_scripts" title="[All scripts]" width="446" />
 	</tab_container>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml
index b3011f4..1e020eb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml
@@ -1,83 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-     hidden="false" left="0" mouse_opaque="true" name="script panel" width="500">
+     left="0" mouse_opaque="true" name="script panel" width="500">
 	<text_editor type="string" length="1" bg_readonly_color="0.392157 0.392157 0.392157 1" bottom="-393"
 	     embedded_items="false" enabled="true" follows="left|top|right|bottom"
-	     font="Monospace" height="376" hidden="false" ignore_tab="false" left="4"
+	     font="Monospace" height="376" ignore_tab="false" left="4"
 	     max_length="65536" mouse_opaque="true" name="Script Editor" width="492"
 	     word_wrap="true">
-Loading...
+		Loading...
 	</text_editor>
 	<button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Save"
-	     label_selected="Save" left="360" mouse_opaque="true" name="Save_btn"
-	     width="128" />
+	     halign="center" height="20" label="Save" label_selected="Save" left="360"
+	     mouse_opaque="true" name="Save_btn" width="128" />
 	<scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"
 	     draw_heading="false" draw_stripes="true" enabled="true"
-	     follows="left|right|bottom" height="60" hidden="false" left="4"
-	     mouse_opaque="true" multi_select="false" name="lsl errors" width="492" />
+	     follows="left|right|bottom" height="60" left="4" mouse_opaque="true"
+	     multi_select="false" name="lsl errors" width="492" />
 	<combo_box allow_text_entry="false" bottom="-499" enabled="true" follows="left|bottom"
-	     height="20" hidden="false" left="12" max_chars="20" mouse_opaque="true"
-	     name="Insert..." label="Insert..." width="128" />
+	     height="20" label="Insert..." left="12" max_chars="20" mouse_opaque="true"
+	     name="Insert..." width="128" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-473" drop_shadow_visible="true" enabled="true"
 	     follows="left|bottom" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="12" hidden="false" left="12" mouse_opaque="true" name="line_col"
-	     v_pad="0" width="128" />
+	     height="12" left="12" mouse_opaque="true" name="line_col" v_pad="0"
+	     width="128" />
 	<menu_bar bottom="-15" drop_shadow="false" enabled="true" follows="left|top|right"
-	     height="18" hidden="false" left="8" mouse_opaque="false" name="script_menu"
-	     opaque="false" tear_off="false" width="476">
+	     height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"
+	     tear_off="false" width="476">
 		<menu bottom="0" color="0 0 0 1" drop_shadow="true" enabled="true" height="62"
-		     hidden="false" left="0" mouse_opaque="false" name="File" opaque="true"
-		     tear_off="false" width="138">
-			<menu_item_call bottom_delta="-30" height="20" hidden="false" label="Save" left="0"
-			     mouse_opaque="true" name="Save" width="138" />
-			<menu_item_separator bottom_delta="-38" height="8" hidden="false" left="0" mouse_opaque="true"
-			     name="separator" width="138" />
-			<menu_item_call bottom_delta="-58" height="20" hidden="false" label="Revert All Changes"
-			     left="0" mouse_opaque="true" name="Revert All Changes" width="138" />
+		     left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"
+		     width="138">
+			<menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"
+			     name="Save" width="138" />
+			<menu_item_separator bottom_delta="-38" height="8" left="0" mouse_opaque="true" name="separator"
+			     width="138" />
+			<menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
+			     mouse_opaque="true" name="Revert All Changes" width="138" />
 		</menu>
 		<menu bottom="665" color="0 0 0 1" drop_shadow="true" enabled="true" height="198"
-		     hidden="false" left="222" mouse_opaque="false" name="Edit" opaque="true"
-		     tear_off="false" width="139">
-			<menu_item_call bottom_delta="-30" enabled="false" height="20" hidden="false" label="Undo"
-			     left="0" mouse_opaque="true" name="Undo" width="139" />
-			<menu_item_call bottom_delta="-50" enabled="false" height="20" hidden="false" label="Redo"
-			     left="0" mouse_opaque="true" name="Redo" width="139" />
-			<menu_item_separator bottom_delta="-58" enabled="true" height="8" hidden="false" label="-----------"
-			     left="0" mouse_opaque="true" name="separator" width="139" />
-			<menu_item_call bottom_delta="-78" enabled="false" height="20" hidden="false" label="Cut"
-			     left="0" mouse_opaque="true" name="Cut" width="139" />
-			<menu_item_call bottom_delta="-98" enabled="false" height="20" hidden="false" label="Copy"
-			     left="0" mouse_opaque="true" name="Copy" width="139" />
-			<menu_item_call bottom_delta="-118" enabled="false" height="20" hidden="false" label="Paste"
-			     left="0" mouse_opaque="true" name="Paste" width="139" />
-			<menu_item_separator bottom_delta="-126" enabled="true" height="8" hidden="false"
-			     label="-----------" left="0" mouse_opaque="true" name="separator2"
-			     width="139" />
-			<menu_item_call bottom_delta="-146" enabled="true" height="20" hidden="false"
-			     label="Select All" left="0" mouse_opaque="true" name="Select All"
-			     width="139" />
-			<menu_item_call bottom_delta="-166" enabled="false" height="20" hidden="false" label="Deselect"
-			     left="0" mouse_opaque="true" name="Deselect" width="139" />
-			<menu_item_separator bottom_delta="-174" enabled="true" height="8" hidden="false"
-			     label="-----------" left="0" mouse_opaque="true" name="separator3"
-			     width="139" />
-			<menu_item_call bottom_delta="-194" enabled="true" height="20" hidden="false"
-			     label="Search / Replace..." left="0" mouse_opaque="true"
-			     name="Search / Replace..." width="139" />
+		     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
+		     width="139">
+			<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
+			     mouse_opaque="true" name="Undo" width="139" />
+			<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
+			     mouse_opaque="true" name="Redo" width="139" />
+			<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator" width="139" />
+			<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
+			     mouse_opaque="true" name="Cut" width="139" />
+			<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
+			     mouse_opaque="true" name="Copy" width="139" />
+			<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
+			     mouse_opaque="true" name="Paste" width="139" />
+			<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator2" width="139" />
+			<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
+			     mouse_opaque="true" name="Select All" width="139" />
+			<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
+			     mouse_opaque="true" name="Deselect" width="139" />
+			<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator3" width="139" />
+			<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
+			     left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
 		</menu>
 		<menu bottom="-18" color="0 0 0 1" drop_shadow="true" enabled="true" height="34"
-		     hidden="false" left="0" mouse_opaque="false" name="Help" opaque="true"
-		     tear_off="false" width="112">
-			<menu_item_call bottom="-30" enabled="true" height="20" hidden="false" label="Help..." left="0"
+		     left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"
+		     width="112">
+			<menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"
 			     mouse_opaque="true" name="Help..." width="112" />
-			<menu_item_call bottom="-30" enabled="true" height="20" hidden="false" label="LSL Wiki Help..." left="0"
+			<menu_item_call bottom="-30" enabled="true" height="20" label="LSL Wiki Help..." left="0"
 			     mouse_opaque="true" name="LSL Wiki Help..." width="112" />
 		</menu>
 	</menu_bar>
-	<text hidden="true" name="loading">Loading...</text>
-	<text hidden="true" name="can_not_view">You are not allowed to view this script.</text>
-	<text hidden="true" name="public_objects_can_not_run">Public Objects cannot run scripts</text>
-	<text hidden="true" name="script_running">Running</text>
+	<string name="loading">
+		Loading...
+	</string>
+	<string name="can_not_view">
+		You are not allowed to view this script.
+	</string>
+	<string name="public_objects_can_not_run">
+		Public Objects cannot run scripts
+	</string>
+	<string name="script_running">
+		Running
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml
index 920f5ae..4118438 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-757" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="550" hidden="false" left="358"
-     min_height="271" min_width="290" mouse_opaque="true"
-     name="preview lsl text" rect_control="PreviewScriptRect"
-     title="Script: Rotation Script" width="500">
+     can_resize="true" enabled="true" height="550" left="358" min_height="271"
+     min_width="290" mouse_opaque="true" name="preview lsl text"
+     rect_control="PreviewScriptRect" title="Script: Rotation Script"
+     width="500">
 	<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-	     hidden="false" left="0" mouse_opaque="true" name="script panel" width="500" />
+	     left="0" mouse_opaque="true" name="script panel" width="500" />
 	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
-	     hidden="false" image_name="icon_lock.tga" left="444" mouse_opaque="true"
-	     name="lock" width="16" />
+	     image_name="icon_lock.tga" left="444" mouse_opaque="true" name="lock"
+	     width="16" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" hidden="false"
-	     left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
 		Description:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" hidden="false" left="93"
-	     max_length="127" mouse_opaque="true" name="desc"
-	     select_all_on_focus_received="false" select_on_focus="false" width="394" />
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="394" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_queue.xml b/linden/indra/newview/skins/xui/en-us/floater_script_queue.xml
index cf9dc2a..c44457c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_queue.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_script_queue.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-763" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="400" hidden="false" left="408"
-     min_height="100" min_width="100" mouse_opaque="true" name="queue"
-     title="Reset Progress" width="300">
+     can_resize="true" enabled="true" height="400" left="408" min_height="100"
+     min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"
+     width="300">
 	<button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="24" hidden="false" label="Close"
-	     label_selected="Close" left="220" mouse_opaque="true" name="close"
-	     width="64" />
+	     halign="center" height="24" label="Close" label_selected="Close" left="220"
+	     mouse_opaque="true" name="close" width="64" />
 	<scroll_list background_visible="true" bottom="-364" column_padding="5" draw_border="true"
 	     draw_heading="false" draw_stripes="true" enabled="true"
-	     follows="left|top|right|bottom" height="344" hidden="false" left="4"
-	     mouse_opaque="true" multi_select="false" name="queue output" width="292" />
+	     follows="left|top|right|bottom" height="344" left="4" mouse_opaque="true"
+	     multi_select="false" name="queue output" width="292" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_search.xml b/linden/indra/newview/skins/xui/en-us/floater_script_search.xml
index 095862e..0702674 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_search.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_script_search.xml
@@ -1,41 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-423" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" can_tear_off="true" enabled="true" height="120"
-     hidden="false" left="223" min_height="100" min_width="100"
-     mouse_opaque="true" name="script search" title="Script Search" width="300">
+     left="223" min_height="100" min_width="100" mouse_opaque="true"
+     name="script search" title="Script Search" width="300">
 	<check_box bottom="-77" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Case Insensitive"
-	     left="55" mouse_opaque="true" name="case_text" radio_style="false"
-	     width="240" />
+	     height="16" initial_value="false" label="Case Insensitive" left="55"
+	     mouse_opaque="true" name="case_text" radio_style="false" width="240" />
 	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
-	     hidden="false" label="Search" label_selected="Search" left="10"
-	     mouse_opaque="true" name="search_btn" scale_image="true" width="90" />
+	     label="Search" label_selected="Search" left="10" mouse_opaque="true"
+	     name="search_btn" scale_image="true" width="90" />
 	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
-	     hidden="false" label="Replace" label_selected="Replace" left="105"
-	     mouse_opaque="true" name="replace_btn" scale_image="true" width="90" />
+	     label="Replace" label_selected="Replace" left="105" mouse_opaque="true"
+	     name="replace_btn" scale_image="true" width="90" />
 	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
-	     hidden="false" label="Replace All" label_selected="Replace All" left="200"
+	     label="Replace All" label_selected="Replace All" left="200"
 	     mouse_opaque="true" name="replace_all_btn" scale_image="true" width="90" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-37" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="5" mouse_opaque="true" name="txt" v_pad="0" width="45">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
+	     mouse_opaque="true" name="txt" v_pad="0" width="45">
 		Search
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-58" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="5" mouse_opaque="true" name="txt2" v_pad="0" width="45">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
+	     mouse_opaque="true" name="txt2" v_pad="0" width="45">
 		Replace
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-37"
 	     enabled="true" follows="left|top" font="SansSerifSmall"
-	     handle_edit_keys_directly="false" height="16" hidden="false" left="55"
-	     max_length="254" mouse_opaque="true" name="search_text"
-	     select_all_on_focus_received="false" select_on_focus="false" width="240" />
+	     handle_edit_keys_directly="false" height="16" left="55" max_length="254"
+	     mouse_opaque="true" name="search_text" select_all_on_focus_received="false"
+	     select_on_focus="false" width="240" />
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-58"
 	     enabled="true" follows="left|top" font="SansSerifSmall"
-	     handle_edit_keys_directly="false" height="16" hidden="false" left="55"
-	     max_length="254" mouse_opaque="true" name="replace_text"
+	     handle_edit_keys_directly="false" height="16" left="55" max_length="254"
+	     mouse_opaque="true" name="replace_text"
 	     select_all_on_focus_received="false" select_on_focus="false" width="240" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_select_key.xml b/linden/indra/newview/skins/xui/en-us/floater_select_key.xml
index 7c2221f..0a9b7ce 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_select_key.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_select_key.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="true" bottom="372" can_close="false" can_drag_on_left="false"
-     can_minimize="false" can_resize="false" can_tear_off="true" enabled="true"
-     height="100" hidden="false" left="415" min_height="100" min_width="100"
-     mouse_opaque="true" name="modal container" title=" " width="240">
-	<button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Cancel" label_selected="Cancel" left="138"
-	     mouse_opaque="true" name="Cancel" scale_image="true" width="82" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-	     left="20" mouse_opaque="true" name="Save item as:" v_pad="0" width="200">
-		Press a key to select
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="372" can_close="false" can_drag_on_left="false"
+     can_minimize="false" can_resize="false" can_tear_off="true" enabled="true"
+     height="100" left="415" min_height="100" min_width="100"
+     mouse_opaque="true" name="modal container" title="" width="240">
+	<button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Cancel" label_selected="Cancel" left="138" mouse_opaque="true"
+	     name="Cancel" scale_image="true" width="82" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="20"
+	     mouse_opaque="true" name="Save item as:" v_pad="0" width="200">
+		Press a key to select
+	</text>
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
index 23202d5..82ed992 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
@@ -20,14 +20,12 @@
 	     name="info_size" right="-20" text_color="white">
 		[AREA] sq. m.
 	</text>
-	<!-- <pad height="18" />  -->
-	<text follows="top|left" font="SansSerifHuge" height="24" left="16"
-	     name="info_action" text_color="white" width="200" bottom_delta="-64">
+	<text bottom_delta="-64" follows="top|left" font="SansSerifHuge" height="24"
+	     left="16" name="info_action" text_color="white" width="200">
 		To sell this parcel:
 	</text>
-	<!-- <pad height="10" /> -->
-	<icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
-	     name="step_price" bottom_delta="-96" width="64" />
+	<icon bottom_delta="-96" follows="top|left" height="64" image_name="badge_note.tga"
+	     left="0" name="step_price" width="64" />
 	<text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
 	     right="-20" text_color="white">
 		Set a price:
@@ -43,7 +41,6 @@
 	<text bottom_delta="0" height="16" left_delta="110" name="price_per_m" width="200">
 		(L$[PER_METER] per square meter)
 	</text>
-	<!-- <pad height="20" /> -->
 	<icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
 	     name="step_sell_to" width="64" />
 	<text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label"
@@ -53,7 +50,8 @@
 	<text follows="top|left" height="16" left="72" name="sell_to_text" right="-20">
 		Choose whether to sell to anyone or a particular buyer.
 	</text>
-	<combo_box follows="top|right" height="16" left="72" name="sell_to" width="140" bottom_delta="-16">
+	<combo_box bottom_delta="-16" follows="top|right" height="16" left="72" name="sell_to"
+	     width="140">
 		<combo_item enabled="false" name="--selectone--" value="select">
 			-- select one --
 		</combo_item>
@@ -74,10 +72,12 @@
 	     name="sell_objects_label" right="-20" text_color="white">
 		Sell the objects with the land?
 	</text>
-	<text follows="top|left" height="16" left="72" name="sell_objects_text" bottom_delta="-20">
+	<text bottom_delta="-20" follows="top|left" height="16" left="72"
+	     name="sell_objects_text">
 		Land owner&apos;s transferable objects on parcel will change ownership.
 	</text>
-	<radio_group follows="top|right" height="40" left="72" name="sell_objects" right="420" bottom_delta="-44">
+	<radio_group bottom_delta="-44" follows="top|right" height="40" left="72"
+	     name="sell_objects" right="420">
 		<radio_item bottom="0" height="0" left="10" name="none" visible="false" />
 		<radio_item bottom="-20" height="16" left="10" name="no">
 			No, keep ownership of objects
@@ -86,14 +86,14 @@
 			Yes, sell objects with land
 		</radio_item>
 	</radio_group>
-	<button bottom_delta="4" height="16" label="Show Objects" right="414"
-	     name="show_objects" width="110" />
+	<button bottom_delta="4" height="16" label="Show Objects" name="show_objects"
+	     right="414" width="110" />
 	<text bottom_delta="-35" follows="top|left" height="16" left="72"
 	     name="nag_message_label" right="-20" text_color="white">
 		REMEMBER: All sales are final.
 	</text>
 	<button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale"
 	     left="72" name="sell_btn" width="130" />
-	<button bottom_delta="0" follows="bottom|right" height="20" label="Cancel" right="444"
-	     name="cancel_btn" width="90" />
+	<button bottom_delta="0" follows="bottom|right" height="20" label="Cancel"
+	     name="cancel_btn" right="444" width="90" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml b/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
index 43c6aa0..ed31742 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="215" name="settings_debug"
      title="Debug Settings" width="350">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml b/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml
index 5daa44b..cbb2326 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml
@@ -5,13 +5,17 @@
 	<button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20"
 	     label="Close" name="close_btn" right="-10" width="50" />
 	<web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
-	     name="release_message_floater_browser" right="-15" top="-30" /> 
-	<text hidden="true" name="in-world_help_title">In-World Help</text>
-	<text hidden="true" name="in-world_help_url">
+	     name="release_message_floater_browser" right="-15" top="-30" />
+	<string name="in-world_help_title">
+		In-World Help
+	</string>
+	<string name="in-world_help_url">
 		http://www.secondlife.com/app/support/inworld.html
-	</text>
-	<text hidden="true" name="additional_help_title">Additional Help</text>
-	<text hidden="true" name="additional_help_url">
+	</string>
+	<string name="additional_help_title">
+		Additional Help
+	</string>
+	<string name="additional_help_url">
 		http://www.secondlife.com/app/support/support.html
-	</text>
-</floater>
\ No newline at end of file
+	</string>
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
index cdb61dd..2199db9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="410" name="Snapshot"
+<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" follows="left|top" height="526" name="Snapshot"
      rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
 	<text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
 	     width="195">
@@ -18,12 +18,37 @@
 			Save snapshot to hard drive
 		</radio_item>
 	</radio_group>
+	<text bottom="-240" follows="left|top" height="25" left="10" name="file_size_label"
+	     width="195">
+		File size: [SIZE] KB
+	</text>
+	<button bottom="-250" follows="left|top" height="20" label="Refresh Snapshot" left="10"
+	     name="new_snapshot_btn" width="195" />
+	<button bottom_delta="-20" follows="left|top" height="20" label="Send" left="10"
+	     name="send_btn" width="105" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Upload (L$10)" left="10"
+	     name="upload_btn" width="105" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
+	     name="save_btn" width="105" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120"
+	     name="discard_btn" width="85" />
+	<button bottom="-290" follows="left|top" font="SansSerifSmall" halign="center"
+	     height="20" hidden="false" label="More &gt;&gt;" left="10"
+	     mouse_opaque="true" name="more_btn" scale_image="TRUE"
+	     tool_tip="Advanced Options" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+	     height="20" hidden="false" label="&lt;&lt; Less" left_delta="0"
+	     mouse_opaque="true" name="less_btn" scale_image="TRUE"
+	     tool_tip="Advanced Options" width="80" />
 	<text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label2"
 	     width="195">
 		What size image do you need?
 	</text>
 	<combo_box bottom_delta="-22" follows="left|top" height="20" label="Resolution" left="10"
 	     name="postcard_size_combo" width="195">
+		<combo_item name="CurrentWindow" value="[i0,i0]">
+			Current Window
+		</combo_item>
 		<combo_item name="640x480" value="[i640,i480]">
 			640x480
 		</combo_item>
@@ -33,9 +58,6 @@
 		<combo_item name="1024x768" value="[i1024,i768]">
 			1024x768
 		</combo_item>
-		<combo_item name="CurrentWindow" value="[i0,i0]">
-			Current Window
-		</combo_item>
 		<combo_item name="Custom" value="[i-1,i-1]">
 			Custom
 		</combo_item>
@@ -91,6 +113,8 @@
 	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
 	     increment="32" label="Height" label_width="35" left="110" max_val="6016"
 	     min_val="32" name="snapshot_height" width="95" />
+	<check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10"
+	     name="keep_aspect_check" />
 	<slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
 	     increment="1" initial_val="75" label="Image Quality" left="10"
 	     max_val="100" min_val="0" name="image_quality_slider" width="210" />
@@ -110,31 +134,17 @@
 			Object Mattes
 		</combo_item>
 	</combo_box>
-	<text bottom_delta="-30" follows="left|top" height="25" left="10"
-	     name="file_size_label" width="195">
-		File size: [SIZE] bytes
-	</text>
-	<check_box bottom_delta="-10" follows="left|top" label="Show interface in snapshot"
+	<check_box bottom_delta="-20" follows="left|top" label="Show interface in snapshot"
 	     left="10" name="ui_check" />
 	<check_box bottom_delta="-20" follows="left|top" label="Show HUD objects in snapshot"
 	     left="10" name="hud_check" />
 	<check_box bottom_delta="-20" follows="left|top" label="Keep open after saving" left="10"
 	     name="keep_open_check" />
-	<check_box bottom_delta="-20" follows="left|top" label="Keep specified aspect ratio"
-	     left="10" name="keep_aspect_check" />
 	<check_box bottom_delta="-20" follows="left|top" label="Freeze frame (fullscreen preview)"
 	     left="10" name="freeze_frame_check" />
-	<button bottom_delta="-25" follows="left|top" height="20" label="New Snapshot"
-	     left="10" name="new_snapshot_btn" width="195" />
 	<check_box bottom_delta="-20" follows="left|top" label="Auto-snapshot" left="10"
 	     name="auto_snapshot_check" />
-	<button bottom_delta="-18" follows="left|bottom" height="20" label="Upload (L$10)"
-	     left="10" name="upload_btn" width="105" />
-	<button bottom="10" follows="left|bottom" height="20" label="Send" left="10"
-	     name="send_btn" width="105" />
-	<button bottom_delta="0" follows="left|bottom" height="20" label="Save" left="10"
-	     name="save_btn" width="105" />
-	<button bottom_delta="0" follows="left|bottom" height="20" label="Discard" left="120"
-	     name="discard_btn" width="85" />
-	<text hidden="true" name="unknown">unknown</text>
+	<string name="unknown">
+		unknown
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml
index 6f47e2a..01440fc 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml
@@ -20,16 +20,10 @@
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-23"
 	     follows="left|top|right" font="SansSerifSmall" height="19" left="10"
 	     max_length="127" mouse_opaque="true" name="description_form" width="280" />
-        <button bottom="-180" follows="right|bottom" font="SansSerif" halign="center"
+	<button bottom="-180" follows="right|bottom" font="SansSerif" halign="center"
 	     height="20" label="Cancel" label_selected="Cancel" left="200"
 	     mouse_opaque="true" name="cancel_btn" width="90" />
 	<button bottom="-180" follows="left|bottom" font="SansSerif" halign="center"
 	     height="20" label="Upload (L$10)" label_selected="Upload (L$10)"
 	     left_delta="-135" mouse_opaque="true" name="ok_btn" width="130" />
-	<!--button bottom="-195" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" label="Cancel" label_selected="Cancel" left="160"
-	     mouse_opaque="true" name="cancel_btn" width="130" />
-	<button bottom="-170" follows="left|bottom" font="SansSerif" halign="center"
-	     height="20" label="Upload (L$10)" label_selected="Upload (L$10)"
-	     left_delta="0" mouse_opaque="true" name="ok_btn" width="130" /-->
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_test.xml b/linden/indra/newview/skins/xui/en-us/floater_test.xml
index f6d38ff..58e519f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_test.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_test.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- Please don't commit this with any changes! For local testing only! -->
-<floater bottom="40" left="40" height="225" width="180" 
-	 can_resize="false" can_close="true" can_drag_on_left="false" can_minimize="true"
-	 name="Test" title="Test">
-</floater>
+<floater bottom="40" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="225" left="40" name="Test" title="Test"
+     width="180" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml b/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml
index f9b0f28..feb243a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml
@@ -1,60 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-516" can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="true" can_tear_off="true" enabled="true" height="290"
-     hidden="false" left="478" min_height="290" min_width="410"
-     mouse_opaque="true" name="texture picker" title="Pick: Texture" width="410">
-        <string name="choose_picture">"Click to choose a picture"</string>
+     left="478" min_height="290" min_width="410" mouse_opaque="true"
+     name="texture picker" title="Pick: Texture" width="410">
+	<string name="choose_picture">
+		Click to choose a picture
+	</string>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-110" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="center" height="14" hidden="false"
-	     left="4" mouse_opaque="true" name="Multiple" v_pad="0" width="163">
+	     font="SansSerifSmall" h_pad="0" halign="center" height="14" left="4"
+	     mouse_opaque="true" name="Multiple" v_pad="0" width="163">
 		Multiple
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-204" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-	     left="4" mouse_opaque="true" name="unknown" v_pad="0" width="163">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="4"
+	     mouse_opaque="true" name="unknown" v_pad="0" width="163">
 		Dimensions: [DIMENSIONS]
 	</text>
 	<button bottom="-228" enabled="false" follows="left|bottom" font="SansSerifSmall"
-	     halign="center" height="20" hidden="false" label="Default"
-	     label_selected="Default" left="4" mouse_opaque="true" name="Default"
-	     scale_image="true" width="64" />
+	     halign="center" height="20" label="Default" label_selected="Default"
+	     left="4" mouse_opaque="true" name="Default" scale_image="true" width="64" />
 	<button bottom="-228" enabled="false" follows="left|bottom" font="SansSerifSmall"
-	     halign="center" height="20" hidden="false" label="None"
-	     label_selected="None" left="72" mouse_opaque="true" name="None"
-	     scale_image="true" width="64" />
+	     halign="center" height="20" label="None" label_selected="None" left="72"
+	     mouse_opaque="true" name="None" scale_image="true" width="64" />
 	<button bottom="-252" enabled="true" follows="left|bottom" font="SansSerifSmall"
-	     halign="center" height="20" hidden="false" label="Blank"
-	     label_selected="Blank" left="4" mouse_opaque="true" name="Blank"
-	     scale_image="true" width="64" />
+	     halign="center" height="20" label="Blank" label_selected="Blank" left="4"
+	     mouse_opaque="true" name="Blank" scale_image="true" width="64" />
 	<check_box bottom="-44" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="24" hidden="false" initial_value="true" label="Show Folders"
-	     left="175" mouse_opaque="true" name="show_folders_check"
-	     radio_style="false" width="201" />
-	<search_editor bottom="-36" enabled="true" follows="left|top|right" height="16" hidden="false"
-	     left="175" mouse_opaque="true" name="inventory search editor" width="231"
-	     label="Type here to search" />
+	     height="24" initial_value="true" label="Show Folders" left="175"
+	     mouse_opaque="true" name="show_folders_check" radio_style="false"
+	     width="201" />
+	<search_editor bottom="-36" enabled="true" follows="left|top|right" height="16"
+	     label="Type here to search" left="175" mouse_opaque="true"
+	     name="inventory search editor" width="231" />
 	<inventory_panel allow_multi_select="false" border="true" bottom="-256" enabled="true"
-	     follows="left|top|right|bottom" height="216" hidden="false" left="175"
-	     mouse_opaque="true" name="inventory panel"
-	     sort_order="TexturePickerSortOrder" width="231" />
+	     follows="left|top|right|bottom" height="216" left="175" mouse_opaque="true"
+	     name="inventory panel" sort_order="TexturePickerSortOrder" width="231" />
 	<check_box bottom="-282" enabled="true" follows="left|bottom" font="SansSerifSmall"
-	     height="20" hidden="false" initial_value="true" label="Apply Immediately"
-	     left="4" mouse_opaque="true" name="apply_immediate_check"
-	     radio_style="false" width="150" />
+	     height="20" initial_value="true" label="Apply Immediately" left="4"
+	     mouse_opaque="true" name="apply_immediate_check" radio_style="false"
+	     width="150" />
 	<button bottom="-282" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="32" hidden="false"
-	     image_selected="eye_button_active.tga"
+	     halign="center" height="32" image_selected="eye_button_active.tga"
 	     image_unselected="eye_button_inactive.tga" label="" label_selected=""
 	     left="139" mouse_opaque="true" name="Pipette" scale_image="true" width="32" />
 	<button bottom="-282" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Cancel"
-	     label_selected="Cancel" left="186" mouse_opaque="true" name="Cancel"
-	     scale_image="true" width="100" />
+	     halign="center" height="20" label="Cancel" label_selected="Cancel"
+	     left="186" mouse_opaque="true" name="Cancel" scale_image="true" width="100" />
 	<button bottom="-282" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" hidden="false" label="Select"
-	     label_selected="Select" left="290" mouse_opaque="true" name="Select"
-	     scale_image="true" width="100" />
-    <text hidden="true" name="pick title">Pick: </text>
+	     halign="center" height="20" label="Select" label_selected="Select"
+	     left="290" mouse_opaque="true" name="Select" scale_image="true" width="100" />
+	<string name="pick title">
+		Pick:
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
index 59a114f..969a89c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
@@ -1,97 +1,83 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" hidden="false"
-     left="308" min_height="100" min_width="100" mouse_opaque="true"
-     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
-     width="272">
-
-<!-- Main floater tabs -->
-
+     can_resize="false" follows="left|top" height="550" left="308"
+     min_height="100" min_width="100" mouse_opaque="true" name="toolbox floater"
+     rect_control="ToolboxRect" sound_flags="0" title="" width="272">
 	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	     hidden="false" image_disabled="tool_zoom.tga"
+	     image_disabled="tool_zoom.tga"
 	     image_disabled_selected="tool_zoom_active.tga"
 	     image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga"
 	     label="" label_selected="" left="4" mouse_opaque="true" name="button focus"
 	     tool_tip="Focus" width="32" />
 	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	     hidden="false" image_disabled="UIImgGrabUUID"
+	     image_disabled="UIImgGrabUUID"
 	     image_disabled_selected="UIImgGrabSelectedUUID"
 	     image_selected="UIImgGrabSelectedUUID" image_unselected="UIImgGrabUUID"
 	     label="" label_selected="" left="40" mouse_opaque="true" name="button move"
 	     tool_tip="Move" width="32" />
 	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	     hidden="false" image_disabled="UIImgFaceUUID"
+	     image_disabled="UIImgFaceUUID"
 	     image_disabled_selected="UIImgFaceSelectedUUID"
 	     image_selected="UIImgFaceSelectedUUID" image_unselected="UIImgFaceUUID"
 	     label="" label_selected="" left="76" mouse_opaque="true" name="button edit"
 	     tool_tip="Edit" width="32" />
 	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	     hidden="false" image_disabled="UIImgCreateUUID"
+	     image_disabled="UIImgCreateUUID"
 	     image_disabled_selected="UIImgCreateSelectedUUID"
 	     image_selected="UIImgCreateSelectedUUID" image_unselected="UIImgCreateUUID"
 	     label="" label_selected="" left="112" mouse_opaque="true"
 	     name="button create" tool_tip="Create" width="32" />
 	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	     hidden="false" image_disabled="tool_dozer.tga"
+	     image_disabled="tool_dozer.tga"
 	     image_disabled_selected="tool_dozer_active.tga"
 	     image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
 	     label="" label_selected="" left="148" mouse_opaque="true"
 	     name="button land" tool_tip="Land" width="32" />
-
-<!-- Focus panel -->
-
 	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Zoom" left="4"
-	     mouse_opaque="true" name="radio zoom" radio_style="true" width="114" />
-	<volume_slider bottom="-69" follows="left|top" height="14" hidden="false" increment="0.01"
+	     initial_value="false" label="Zoom" left="4" mouse_opaque="true"
+	     name="radio zoom" radio_style="true" width="114" />
+	<volume_slider bottom="-69" follows="left|top" height="14" increment="0.01"
 	     initial_val="0.125" left="114" max_val="0.5" min_val="0"
 	     mouse_opaque="true" name="slider zoom" width="134" />
 	<check_box bottom="-84" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Orbit (Ctrl)" left="4"
-	     mouse_opaque="true" name="radio orbit" radio_style="true" width="114" />
+	     initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
+	     name="radio orbit" radio_style="true" width="114" />
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Pan (Ctrl-Shift)" left="4"
-	     mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
-
-<!-- Move panel -->
-
+	     initial_value="false" label="Pan (Ctrl-Shift)" left="4" mouse_opaque="true"
+	     name="radio pan" radio_style="true" width="114" />
 	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Move" left="4"
-	     mouse_opaque="true" name="radio move" radio_style="true" width="114" />
+	     initial_value="false" label="Move" left="4" mouse_opaque="true"
+	     name="radio move" radio_style="true" width="114" />
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Lift (Ctrl)" left="4"
-	     mouse_opaque="true" name="radio lift" radio_style="true" width="114" />
+	     initial_value="false" label="Lift (Ctrl)" left="4" mouse_opaque="true"
+	     name="radio lift" radio_style="true" width="114" />
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Spin (Ctrl-Shift)" left="4"
+	     initial_value="false" label="Spin (Ctrl-Shift)" left="4"
 	     mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
-
-<!-- Edit panel -->
-
 	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Position" left="4"
-	     mouse_opaque="true" name="radio position" radio_style="true" width="114" />
+	     initial_value="false" label="Position" left="4" mouse_opaque="true"
+	     name="radio position" radio_style="true" width="114" />
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Rotate (Ctrl)" left="4"
-	     mouse_opaque="true" name="radio rotate" radio_style="true" width="114" />
+	     initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
+	     name="radio rotate" radio_style="true" width="114" />
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
+	     initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
 	     mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Select Texture" left="4"
-	     mouse_opaque="true" name="radio select face" radio_style="true" width="114" />
+	     initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
+	     name="radio select face" radio_style="true" width="114" />
 	<check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-	     label="Edit linked parts" left="4" mouse_opaque="true" 
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Edit linked parts" left="4" mouse_opaque="true"
 	     name="checkbox edit linked parts" width="114" />
-
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" hidden="false"
-	     left="6" mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
+	     mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
 		Ruler mode:
 	</text>
 	<combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
-	     hidden="false" left_delta="74" max_chars="20" mouse_opaque="true"
+	     left_delta="74" max_chars="20" mouse_opaque="true"
 	     name="combobox grid mode" width="86">
 		<combo_item name="World" value="World">
 			World
@@ -103,179 +89,163 @@
 			Reference
 		</combo_item>
 	</combo_box>
-
 	<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Stretch Both Sides" left="143" mouse_opaque="true"
 	     name="checkbox uniform" width="134" />
 	<check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+	     font="SansSerifSmall" height="16" initial_value="true"
 	     label="Stretch Textures" left_delta="0" mouse_opaque="true"
 	     name="checkbox stretch textures" width="134" />
 	<check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-	     label="Use Grid" left_delta="0" mouse_opaque="true"
-	     name="checkbox snap to grid" width="134" />
+	     font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
+	     left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
 	<button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="16" hidden="false" label="Options..." label_selected="Options..."
-	     left_delta="20" mouse_opaque="true" name="Options..." scale_image="TRUE"
-	     width="80" />
-
-<!-- Help text -->
-
+	     height="16" label="Options..." label_selected="Options..." left_delta="20"
+	     mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-52" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="4" mouse_opaque="true" name="text status" v_pad="0" width="264">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+	     mouse_opaque="true" name="text status" v_pad="0" width="264">
 		Drag to move, shift-drag to copy
 	</text>
-
-<!-- Create panel -->
-
 	<button bottom="-75" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_cube.tga"
+	     image_disabled="object_cube.tga"
 	     image_disabled_selected="object_cube_active.tga"
 	     image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
 	     label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
 	     scale_image="TRUE" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_prism.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_prism.tga"
 	     image_disabled_selected="object_prism_active.tga"
 	     image_selected="object_prism_active.tga"
 	     image_unselected="object_prism.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
 	     width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_pyramid.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_pyramid.tga"
 	     image_disabled_selected="object_pyramid_active.tga"
 	     image_selected="object_pyramid_active.tga"
 	     image_unselected="object_pyramid.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
 	     width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_tetrahedron.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_tetrahedron.tga"
 	     image_disabled_selected="object_tetrahedron_active.tga"
 	     image_selected="object_tetrahedron_active.tga"
 	     image_unselected="object_tetrahedron.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
 	     scale_image="TRUE" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_cylinder.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_cylinder.tga"
 	     image_disabled_selected="object_cylinder_active.tga"
 	     image_selected="object_cylinder_active.tga"
 	     image_unselected="object_cylinder.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolCylinder" scale_image="TRUE"
 	     width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_hemi_cylinder.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_hemi_cylinder.tga"
 	     image_disabled_selected="object_hemi_cylinder_active.tga"
 	     image_selected="object_hemi_cylinder_active.tga"
 	     image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
 	     scale_image="TRUE" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_cone.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_cone.tga"
 	     image_disabled_selected="object_cone_active.tga"
 	     image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
 	     label="" label_selected="" left_delta="23" mouse_opaque="true"
 	     name="ToolCone" scale_image="TRUE" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_hemi_cone.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_hemi_cone.tga"
 	     image_disabled_selected="object_hemi_cone_active.tga"
 	     image_selected="object_hemi_cone_active.tga"
 	     image_unselected="object_hemi_cone.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
 	     width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_sphere.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_sphere.tga"
 	     image_disabled_selected="object_sphere_active.tga"
 	     image_selected="object_sphere_active.tga"
 	     image_unselected="object_sphere.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
 	     width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_hemi_sphere.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_hemi_sphere.tga"
 	     image_disabled_selected="object_hemi_sphere_active.tga"
 	     image_selected="object_hemi_sphere_active.tga"
 	     image_unselected="object_hemi_sphere.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
 	     scale_image="TRUE" width="24" />
-
-	<button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_torus.tga"
+	<button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_torus.tga"
 	     image_disabled_selected="object_torus_active.tga"
 	     image_selected="object_torus_active.tga"
 	     image_unselected="object_torus.tga" label="" label_selected="" left="4"
 	     mouse_opaque="true" name="ToolTorus" scale_image="TRUE" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_tube.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_tube.tga"
 	     image_disabled_selected="object_tube_active.tga"
 	     image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
 	     label="" label_selected="" left_delta="23" mouse_opaque="true"
 	     name="ToolTube" scale_image="TRUE" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_ring.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_ring.tga"
 	     image_disabled_selected="object_ring_active.tga"
 	     image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
 	     label="" label_selected="" left_delta="23" mouse_opaque="true"
 	     name="ToolRing" scale_image="TRUE" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_tree.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_tree.tga"
 	     image_disabled_selected="object_tree_active.tga"
 	     image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
 	     label="" label_selected="" left_delta="23" mouse_opaque="true"
 	     name="ToolTree" scale_image="TRUE" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="24"
-	     hidden="false" image_disabled="object_grass.tga"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_grass.tga"
 	     image_disabled_selected="object_grass_active.tga"
 	     image_selected="object_grass_active.tga"
 	     image_unselected="object_grass.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
 	     width="24" />
-
 	<check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Keep Tool Selected" left="4" mouse_opaque="true"
 	     name="checkbox sticky" width="128" />
 	<check_box bottom_delta="-15" control_name="CreateToolCopySelection" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Copy Selection" left_delta="0" mouse_opaque="true"
 	     name="checkbox copy selection" width="134" />
 	<check_box bottom_delta="-15" control_name="CreateToolCopyCenters" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-	     label="Center Copy" left_delta="20" mouse_opaque="true"
-	     name="checkbox copy centers" width="134" />
+	     font="SansSerifSmall" height="16" initial_value="true" label="Center Copy"
+	     left_delta="20" mouse_opaque="true" name="checkbox copy centers"
+	     width="134" />
 	<check_box bottom_delta="-15" control_name="CreateToolCopyRotates" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-	     label="Rotate Copy" left_delta="0" mouse_opaque="true"
-	     name="checkbox copy rotates" width="134" />
-
-<!-- Land panel -->
-
+	     font="SansSerifSmall" height="16" initial_value="false" label="Rotate Copy"
+	     left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />
 	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Select Land" left="4"
-	     mouse_opaque="true" name="radio select land" radio_style="true" width="114" />
+	     initial_value="false" label="Select Land" left="4" mouse_opaque="true"
+	     name="radio select land" radio_style="true" width="114" />
 	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Flatten Land" left="4"
-	     mouse_opaque="true" name="radio flatten" radio_style="true" width="114" />
+	     initial_value="false" label="Flatten Land" left="4" mouse_opaque="true"
+	     name="radio flatten" radio_style="true" width="114" />
 	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Raise Land" left="4"
-	     mouse_opaque="true" name="radio raise" radio_style="true" width="114" />
+	     initial_value="false" label="Raise Land" left="4" mouse_opaque="true"
+	     name="radio raise" radio_style="true" width="114" />
 	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Lower Land" left="4"
-	     mouse_opaque="true" name="radio lower" radio_style="true" width="114" />
+	     initial_value="false" label="Lower Land" left="4" mouse_opaque="true"
+	     name="radio lower" radio_style="true" width="114" />
 	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Smooth Land" left="4"
-	     mouse_opaque="true" name="radio smooth" radio_style="true" width="114" />
+	     initial_value="false" label="Smooth Land" left="4" mouse_opaque="true"
+	     name="radio smooth" radio_style="true" width="114" />
 	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Roughen Land" left="4"
-	     mouse_opaque="true" name="radio noise" radio_style="true" width="114" />
+	     initial_value="false" label="Roughen Land" left="4" mouse_opaque="true"
+	     name="radio noise" radio_style="true" width="114" />
 	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     hidden="false" initial_value="false" label="Revert Land" left="4"
-	     mouse_opaque="true" name="radio revert" radio_style="true" width="114" />
-	<combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18"
-	     hidden="false" left="118" max_chars="20" mouse_opaque="true"
-	     name="combobox brush size" width="134">
+	     initial_value="false" label="Revert Land" left="4" mouse_opaque="true"
+	     name="radio revert" radio_style="true" width="114" />
+	<combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118"
+	     max_chars="20" mouse_opaque="true" name="combobox brush size" width="134">
 		<combo_item name="Small" value="Small">
 			Small
 		</combo_item>
@@ -287,201 +257,186 @@
 		</combo_item>
 	</combo_box>
 	<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="16" hidden="false" label="Apply to selection"
-	     label_selected="Apply to selection" left="118" mouse_opaque="true"
-	     name="button apply to selection" scale_image="TRUE"
-	     tool_tip="Modify Selected Land" width="134" />
+	     height="16" label="Apply to selection" label_selected="Apply to selection"
+	     left="118" mouse_opaque="true" name="button apply to selection"
+	     scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
 	<check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-	     label="Show Owners" left="118" mouse_opaque="true"
-	     name="checkbox show owners" width="134" />
+	     font="SansSerifSmall" height="16" initial_value="false" label="Show Owners"
+	     left="118" mouse_opaque="true" name="checkbox show owners" width="134" />
 	<button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" hidden="false" label="More &gt;&gt;" left="186"
-	     mouse_opaque="true" name="button more" scale_image="TRUE"
-	     tool_tip="Advanced Options" width="80" />
+	     height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
+	     name="button more" scale_image="TRUE" tool_tip="Advanced Options"
+	     width="80" />
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" hidden="false" label="&lt;&lt; Less" left_delta="0"
-	     mouse_opaque="true" name="button less" scale_image="TRUE"
-	     tool_tip="Advanced Options" width="80" />
-
-<!-- Sub-tabs -->
-
-	<tab_container bottom="-550" follows="left|top" height="384" hidden="false" left="0"
-	     mouse_opaque="false" name="Object Info Tabs" tab_max_width="52"
-	     tab_min_width="60" tab_position="top" width="272">
-
-<!-- General sub-tab -->
-
+	     height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
+	     name="button less" scale_image="TRUE" tool_tip="Advanced Options"
+	     width="80" />
+	<tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
+	     name="Object Info Tabs" tab_max_width="52" tab_min_width="60"
+	     tab_position="top" width="272">
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     hidden="false" label="General" left="1" mouse_opaque="false" name="General"
-		     width="270">
+		     label="General" left="1" mouse_opaque="false" name="General" width="270">
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="Name:" v_pad="0" width="78">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Name:" v_pad="0" width="78">
 				Name:
 			</text>
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
-			     follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-			     left="88" max_length="63" mouse_opaque="true" name="Object Name"
+			     follows="left|top|right" font="SansSerifSmall" height="16" left="88"
+			     max_length="63" mouse_opaque="true" name="Object Name"
 			     select_all_on_focus_received="true" width="172" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-40" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="Description:" v_pad="0" width="78">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Description:" v_pad="0" width="78">
 				Description:
 			</text>
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
-			     follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-			     left="88" max_length="127" mouse_opaque="true" name="Object Description"
+			     follows="left|top|right" font="SansSerifSmall" height="16" left="88"
+			     max_length="127" mouse_opaque="true" name="Object Description"
 			     select_all_on_focus_received="true" width="172" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-66" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="10" mouse_opaque="true" name="Creator:" v_pad="0" width="78">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			     mouse_opaque="true" name="Creator:" v_pad="0" width="78">
 				Creator:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-66" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left_delta="78" mouse_opaque="true" name="Creator Name" v_pad="0"
-			     width="88">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+			     mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
 				Thrax Linden
 			</text>
 			<button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Profile..." label_selected="Profile..."
-			     left_delta="94" mouse_opaque="true" name="button creator profile"
-			     scale_image="TRUE" width="78" />
+			     height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+			     mouse_opaque="true" name="button creator profile" scale_image="TRUE"
+			     width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-86" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="10" mouse_opaque="true" name="Owner:" v_pad="0" width="78">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			     mouse_opaque="true" name="Owner:" v_pad="0" width="78">
 				Owner:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-86" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left_delta="78" mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+			     mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
 				Thrax Linden
 			</text>
 			<button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Profile..." label_selected="Profile..."
-			     left_delta="94" mouse_opaque="true" name="button owner profile"
-			     scale_image="TRUE" width="78" />
+			     height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+			     mouse_opaque="true" name="button owner profile" scale_image="TRUE"
+			     width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-106" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="10" mouse_opaque="true" name="Group:" v_pad="0" width="78">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			     mouse_opaque="true" name="Group:" v_pad="0" width="78">
 				Group:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-106" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="true"
-			     left_delta="78" mouse_opaque="true" name="Group Name Proxy" v_pad="0"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+			     mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
 			     width="88">
 				The Lindens
 			</text>
 			<button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Set..." label_selected="Set..."
-			     left_delta="94" mouse_opaque="true" name="button set group"
-			     scale_image="TRUE" width="78" />
+			     height="16" label="Set..." label_selected="Set..." left_delta="94"
+			     mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-126" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="10" mouse_opaque="true" name="prim info" v_pad="0" width="166">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			     mouse_opaque="true" name="prim info" v_pad="0" width="166">
 				1 Object, 1 Primitive
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="10" mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			     mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
 				Permissions:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left="10" mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			     mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
 				You can modify this object.
 			</text>
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Share with group" left="10"
+			     initial_value="false" label="Share with group" left="10"
 			     mouse_opaque="true" name="checkbox share with group"
 			     tool_tip="Allow group members to move, modify, copy and delete."
 			     width="166" />
-			<text hidden="true" name="text deed continued">
+			<string name="text deed continued">
 				Deed...
-			</text>
-			<text hidden="true" name="text deed">
+			</string>
+			<string name="text deed">
 				Deed
-			</text>
+			</string>
 			<button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Deed..." label_selected="Deed..."
-			     left_delta="172" mouse_opaque="true" name="button deed" scale_image="TRUE"
+			     height="16" label="Deed..." label_selected="Deed..." left_delta="172"
+			     mouse_opaque="true" name="button deed" scale_image="TRUE"
 			     tool_tip="Group shared objects can be deeded by a group officer."
 			     width="78" />
 			<check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Allow anyone to move" left="10"
+			     initial_value="false" label="Allow anyone to move" left="10"
 			     mouse_opaque="true" name="checkbox allow everyone move" width="142" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Allow anyone to copy" left="10"
+			     initial_value="false" label="Allow anyone to copy" left="10"
 			     mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Show in search" left="10"
-			     name="search_check" tool_tip="Let people see this object in search results" width="78" />
+			     initial_value="false" label="Show in search" left="10" name="search_check"
+			     tool_tip="Let people see this object in search results" width="78" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="For Sale" left="10"
-			     mouse_opaque="true" name="checkbox for sale" width="78" />
+			     initial_value="false" label="For Sale" left="10" mouse_opaque="true"
+			     name="checkbox for sale" width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			     left_delta="100" mouse_opaque="true" name="Price:  L$" v_pad="0" width="56">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="100"
+			     mouse_opaque="true" name="Price:  L$" v_pad="0" width="56">
 				Price:  L$
 			</text>
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-			     follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-			     left_delta="56" max_length="25" mouse_opaque="true" name="EdCost"
-			     width="84" />
+			     follows="left|top|right" font="SansSerifSmall" height="16" left_delta="56"
+			     max_length="25" mouse_opaque="true" name="EdCost" width="84" />
 			<radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
-			     hidden="false" left="42" mouse_opaque="true" name="sale type" width="218">
-				<radio_item bottom="-16" follows="left|top" height="16" hidden="false" left="0"
-				     mouse_opaque="true" name="Original" width="70">
+			     left="42" mouse_opaque="true" name="sale type" width="218">
+				<radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
+				     name="Original" width="70">
 					Original
 				</radio_item>
-				<radio_item bottom="-16" follows="left|top" height="16" hidden="false" left="70"
-				     mouse_opaque="true" name="Copy" width="70">
+				<radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"
+				     name="Copy" width="70">
 					Copy
 				</radio_item>
-				<radio_item bottom="-16" follows="left|top" height="16" hidden="false" left="140"
-				     mouse_opaque="true" name="Contents" width="76">
+				<radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"
+				     name="Contents" width="76">
 					Contents
 				</radio_item>
 			</radio_group>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-298" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
 				Next owner can:
 			</text>
 			<check_box bottom_delta="-22" follows="left|top|right" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Modify" left="10"
-			     mouse_opaque="true" name="checkbox next owner can modify" width="250" />
+			     initial_value="false" label="Modify" left="10" mouse_opaque="true"
+			     name="checkbox next owner can modify" width="250" />
 			<check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Copy" left_delta="60"
-			     mouse_opaque="true" name="checkbox next owner can copy" width="190" />
+			     initial_value="false" label="Copy" left_delta="60" mouse_opaque="true"
+			     name="checkbox next owner can copy" width="190" />
 			<check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Resell/Give away"
-			     left_delta="60" mouse_opaque="true" name="checkbox next owner can transfer"
-			     width="130" />
+			     initial_value="false" label="Resell/Give away" left_delta="60"
+			     mouse_opaque="true" name="checkbox next owner can transfer" width="130" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-332" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="label click action" v_pad="0"
-			     width="150">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="label click action" v_pad="0" width="150">
 				When Left-Clicked:
 			</text>
 			<combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
-			     hidden="false" left="10" max_chars="20" mouse_opaque="true"
-			     name="clickaction" width="150">
+			     left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
 				<combo_item name="Touch/grab(default)" value="Touch/grab (default)">
 					Touch/grab (default)
 				</combo_item>
@@ -497,158 +452,159 @@
 				<combo_item name="Open" value="Open">
 					Open
 				</combo_item>
+				<combo_item name="Play" value="Play">
+					Play parcel media
+				</combo_item>
+				<combo_item name="Opemmedia" value="Open Media">
+					Open parcel media
+				</combo_item>
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-135" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="88" mouse_opaque="true" name="B:" v_pad="0" width="174">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
+			     mouse_opaque="true" name="B:" v_pad="0" width="174">
 				B:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-135" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left_delta="50" mouse_opaque="true" name="O:" v_pad="0" width="124">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+			     mouse_opaque="true" name="O:" v_pad="0" width="124">
 				O;
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-135" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left_delta="50" mouse_opaque="true" name="G:" v_pad="0" width="74">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+			     mouse_opaque="true" name="G:" v_pad="0" width="74">
 				G:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-147" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="88" mouse_opaque="true" name="E:" v_pad="0" width="174">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
+			     mouse_opaque="true" name="E:" v_pad="0" width="174">
 				E:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-147" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left_delta="50" mouse_opaque="true" name="N:" v_pad="0" width="124">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+			     mouse_opaque="true" name="N:" v_pad="0" width="124">
 				N:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-147" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left_delta="50" mouse_opaque="true" name="F:" v_pad="0" width="74">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+			     mouse_opaque="true" name="F:" v_pad="0" width="74">
 				F:
 			</text>
-			<text hidden="true" name="text modify info 1">
+			<string name="text modify info 1">
 				You can modify this object.
-			</text>
-			<text hidden="true" name="text modify info 2">
+			</string>
+			<string name="text modify info 2">
 				You can modify these objects.
-			</text>
-			<text hidden="true" name="text modify info 3">
+			</string>
+			<string name="text modify info 3">
 				You cannot modify this object.
-			</text>
-			<text hidden="true" name="text modify info 4">
+			</string>
+			<string name="text modify info 4">
 				You cannot modify these objects.
-			</text>
-			<text hidden="true" name="text modify warning">
+			</string>
+			<string name="text modify warning">
 				Must select entire object to set permissions.
-			</text>
+			</string>
 		</panel>
-
-<!-- Object sub-tab -->
-
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     hidden="false" label="Object" left="1" mouse_opaque="false" name="Object"
-		     width="270">
+		     label="Object" left="1" mouse_opaque="false" name="Object" width="270">
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="select_single" v_pad="0" width="252">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="select_single" v_pad="0" width="252">
 				Select only one primitive to edit parameters.
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left_delta="0" mouse_opaque="true" name="edit_object" v_pad="0" width="252">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+			     mouse_opaque="true" name="edit_object" v_pad="0" width="252">
 				Edit object parameters:
 			</text>
 			<check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Locked" left="8"
-			     mouse_opaque="true" name="checkbox locked"
+			     initial_value="false" label="Locked" left="8" mouse_opaque="true"
+			     name="checkbox locked"
 			     tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
 			     width="123" />
 			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Physical" left="8"
-			     mouse_opaque="true" name="Physical Checkbox Ctrl"
+			     initial_value="false" label="Physical" left="8" mouse_opaque="true"
+			     name="Physical Checkbox Ctrl"
 			     tool_tip="Allows object to be pushed and affected by gravity" width="123" />
 			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Temporary" left="8"
-			     mouse_opaque="true" name="Temporary Checkbox Ctrl"
+			     initial_value="false" label="Temporary" left="8" mouse_opaque="true"
+			     name="Temporary Checkbox Ctrl"
 			     tool_tip="Causes object to be deleted 1 minute after creation." width="123" />
 			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Phantom" left="8"
-			     mouse_opaque="true" name="Phantom Checkbox Ctrl"
+			     initial_value="false" label="Phantom" left="8" mouse_opaque="true"
+			     name="Phantom Checkbox Ctrl"
 			     tool_tip="Causes object to not collide with other objects or avatars"
 			     width="123" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="label position" v_pad="0" width="121">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="label position" v_pad="0" width="121">
 				Position (meters)
 			</text>
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.01" initial_val="0" label="X" label_width="10"
-			     left="10" max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
+			     increment="0.01" initial_val="0" label="X" label_width="10" left="10"
+			     max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
 			     text_enabled_color="1, 0.25, 0, 1" width="87" />
 			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.01" initial_val="0" label="Y" label_width="10"
-			     left="10" max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
+			     increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
+			     max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
 			     text_enabled_color="0, 1, 0, 1" width="87" />
 			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.01" initial_val="0" label="Z" label_width="10"
-			     left="10" max_val="768" min_val="0" mouse_opaque="true" name="Pos Z"
+			     increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
+			     max_val="768" min_val="0" mouse_opaque="true" name="Pos Z"
 			     text_enabled_color="0, 0.5, 1, 1" width="87" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="label size" v_pad="0" width="121">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="label size" v_pad="0" width="121">
 				Size (meters)
 			</text>
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.01" initial_val="0" label="X" label_width="10"
-			     left="10" max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
+			     increment="0.01" initial_val="0" label="X" label_width="10" left="10"
+			     max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
 			     text_enabled_color="1, 1, 1, 1" width="87" />
 			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.01" initial_val="0" label="Y" label_width="10"
-			     left="10" max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
+			     increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
+			     max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
 			     text_enabled_color="1, 1, 1, 1" width="87" />
 			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.01" initial_val="0" label="Z" label_width="10"
-			     left="10" max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
+			     increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
+			     max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
 			     text_enabled_color="1, 1, 1, 1" width="87" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="label rotation" v_pad="0" width="121">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="label rotation" v_pad="0" width="121">
 				Rotation (degrees)
 			</text>
 			<spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="1" initial_val="0" label="X" label_width="10"
-			     left="10" max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
+			     increment="1" initial_val="0" label="X" label_width="10" left="10"
+			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
 			     text_enabled_color="1, 1, 1, 1" width="87" />
 			<spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="1" initial_val="0" label="Y" label_width="10"
-			     left="10" max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
+			     increment="1" initial_val="0" label="Y" label_width="10" left="10"
+			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
 			     text_enabled_color="1, 1, 1, 1" width="87" />
 			<spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="1" initial_val="0" label="Z" label_width="10"
-			     left="10" max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
+			     increment="1" initial_val="0" label="Z" label_width="10" left="10"
+			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
 			     text_enabled_color="1, 1, 1, 1" width="87" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="label material" v_pad="0" width="121">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="label material" v_pad="0" width="121">
 				Material
 			</text>
 			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     hidden="false" left="10" max_chars="20" mouse_opaque="true" name="material"
-			     width="87">
+			     left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
 				<combo_item name="Stone" value="Stone">
 					Stone
 				</combo_item>
@@ -673,13 +629,13 @@
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-36" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="label basetype" v_pad="0" width="141">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="label basetype" v_pad="0" width="141">
 				Building Block Type
 			</text>
 			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-			     hidden="false" left="121" max_chars="20" mouse_opaque="true"
-			     name="comboBaseType" width="141">
+			     left="121" max_chars="20" mouse_opaque="true" name="comboBaseType"
+			     width="141">
 				<combo_item name="Box" value="Box">
 					Box
 				</combo_item>
@@ -701,51 +657,48 @@
 				<combo_item name="Ring" value="Ring">
 					Ring
 				</combo_item>
-                <combo_item name="Sculpted" value="Sculpted">
-                    Sculpted
-                </combo_item>
+				<combo_item name="Sculpted" value="Sculpted">
+					Sculpted
+				</combo_item>
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="text cut" v_pad="0" width="141">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text cut" v_pad="0" width="141">
 				Path Cut Begin and End
 			</text>
 			<spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="0" label="B" label_width="10"
-			     left="121" max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin"
-			     width="68" />
+			     increment="0.05" initial_val="0" label="B" label_width="10" left="121"
+			     max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />
 			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="1" label="E" label_width="10"
-			     left_delta="73" max_val="1" min_val="0.02" mouse_opaque="true"
-			     name="cut end" width="68" />
+			     increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
+			     max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="text hollow" v_pad="0" width="68">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text hollow" v_pad="0" width="68">
 				Hollow
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left_delta="78" mouse_opaque="true" name="text skew" v_pad="0" width="63">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="78"
+			     mouse_opaque="true" name="text skew" v_pad="0" width="63">
 				Skew
 			</text>
 			<spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-			     hidden="false" increment="5" initial_val="0" left="121" max_val="95"
-			     min_val="0" mouse_opaque="true" name="Scale 1" width="68" />
+			     increment="5" initial_val="0" left="121" max_val="95" min_val="0"
+			     mouse_opaque="true" name="Scale 1" width="68" />
 			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="0" left_delta="73"
-			     max_val="0.95" min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
+			     increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
+			     min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
 				Hollow Shape
 			</text>
 			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-			     hidden="false" left="121" max_chars="20" mouse_opaque="true" name="hole"
-			     width="141">
+			     left="121" max_chars="20" mouse_opaque="true" name="hole" width="141">
 				<combo_item name="Default" value="Default">
 					Default
 				</combo_item>
@@ -761,256 +714,248 @@
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="text twist" v_pad="0" width="141">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text twist" v_pad="0" width="141">
 				Twist Begin and End
 			</text>
 			<spinner bottom_delta="-22" decimal_digits="0" follows="left|top" height="16"
-			     hidden="false" increment="9" initial_val="0" label="B" label_width="10"
-			     left="121" max_val="180" min_val="-180" mouse_opaque="true"
-			     name="Twist Begin" width="68" />
+			     increment="9" initial_val="0" label="B" label_width="10" left="121"
+			     max_val="180" min_val="-180" mouse_opaque="true" name="Twist Begin"
+			     width="68" />
 			<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
-			     hidden="false" increment="9" initial_val="0" label="E" label_width="10"
-			     left_delta="73" max_val="180" min_val="-180" mouse_opaque="true"
-			     name="Twist End" width="68" />
+			     increment="9" initial_val="0" label="E" label_width="10" left_delta="73"
+			     max_val="180" min_val="-180" mouse_opaque="true" name="Twist End"
+			     width="68" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="scale_taper" v_pad="0" width="141">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="scale_taper" v_pad="0" width="141">
 				Taper
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="scale_hole" v_pad="0" width="141">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="scale_hole" v_pad="0" width="141">
 				Hole Size
 			</text>
 			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="0" label="X" label_width="10"
-			     left="121" max_val="1" min_val="-1" mouse_opaque="true"
-			     name="Taper Scale X" width="68" />
+			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
+			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale X"
+			     width="68" />
 			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="0" label="Y" label_width="10"
-			     left_delta="73" max_val="1" min_val="-1" mouse_opaque="true"
-			     name="Taper Scale Y" width="68" />
+			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
+			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale Y"
+			     width="68" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="text topshear" v_pad="0" width="141">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text topshear" v_pad="0" width="141">
 				Top Shear
 			</text>
 			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="0" label="X" label_width="10"
-			     left="121" max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear X"
-			     width="68" />
+			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
+			     max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear X" width="68" />
 			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="0" label="Y" label_width="10"
-			     left_delta="73" max_val="0.5" min_val="-0.5" mouse_opaque="true"
-			     name="Shear Y" width="68" />
+			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
+			     max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear Y" width="68" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="advanced_cut" v_pad="0" width="141">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="advanced_cut" v_pad="0" width="141">
 				Profile Cut Begin and End
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left_delta="0" mouse_opaque="true" name="advanced_dimple" v_pad="0"
-			     width="141">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+			     mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">
 				Dimple Begin and End
 			</text>
 			<spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="0" label="B" label_width="10"
-			     left="121" max_val="0.95" min_val="0" mouse_opaque="true"
-			     name="Path Limit Begin" width="68" />
+			     increment="0.05" initial_val="0" label="B" label_width="10" left="121"
+			     max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
+			     width="68" />
 			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="1" label="E" label_width="10"
-			     left_delta="73" max_val="1" min_val="0.05" mouse_opaque="true"
-			     name="Path Limit End" width="68" />
+			     increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
+			     max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
+			     width="68" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="text taper2" v_pad="0" width="141">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text taper2" v_pad="0" width="141">
 				Taper
 			</text>
 			<spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="0" label="X" label_width="10"
-			     left="121" max_val="1" min_val="-1" mouse_opaque="true" name="Taper X"
-			     width="68" />
+			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
+			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />
 			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="0" label="Y" label_width="10"
-			     left_delta="73" max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y"
-			     width="68" />
+			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
+			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="text radius delta" v_pad="0"
-			     width="78">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text radius delta" v_pad="0" width="78">
 				Radius
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left_delta="73" mouse_opaque="true" name="text revolutions" v_pad="0"
-			     width="68">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="73"
+			     mouse_opaque="true" name="text revolutions" v_pad="0" width="68">
 				Revolutions
 			</text>
 			<spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.05" initial_val="0" left="121" max_val="1"
-			     min_val="-1" mouse_opaque="true" name="Radius Offset" width="68" />
+			     increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
+			     mouse_opaque="true" name="Radius Offset" width="68" />
 			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     hidden="false" increment="0.1" initial_val="1" left_delta="73" max_val="4"
-			     min_val="1" mouse_opaque="true" name="Revolutions" width="68" />
+			     increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
+			     mouse_opaque="true" name="Revolutions" width="68" />
 			<texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="141" hidden="false"
-                 	     label="Sculpt Texture" left="121" mouse_opaque="true" name="sculpt texture control"
-                 	     tool_tip="Click to choose a picture" width="141" visible="false"/>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" align="left" height="10" hidden="false"
-			     left="121" mouse_opaque="true" name="label sculpt type" v_pad="0" width="121" visible="false">
-			     	Stitching type
+			     default_image_name="Default" follows="left|top" height="141"
+			     label="Sculpt Texture" left="121" mouse_opaque="true"
+			     name="sculpt texture control" tool_tip="Click to choose a picture"
+			     visible="false" width="141" />
+			<text align="left" bg_visible="false" border_drop_shadow_visible="false"
+			     border_visible="false" bottom_delta="-20" drop_shadow_visible="true"
+			     follows="left|top" font="SansSerifSmall" h_pad="0" height="10" left="121"
+			     mouse_opaque="true" name="label sculpt type" v_pad="0" visible="false"
+			     width="121">
+				Stitching type
 			</text>
 			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-			     hidden="false" left="121" max_chars="20" mouse_opaque="true"
-			     name="sculpt type control" width="141" visible="false">
-			  <combo_item name="None" value="None" hidden="false">
-			    (none)
-			  </combo_item>
-			  <combo_item name="Sphere" value="Sphere">
-			    Sphere
-			  </combo_item>
-			  <combo_item name="Torus" value="Torus">
-			    Torus
-			  </combo_item>
-			  <combo_item name="Plane" value="Plane">
-			    Plane
-			  </combo_item>
-			  <combo_item name="Cylinder" value="Cylinder">
-			    Cylinder
-			  </combo_item>
+			     left="121" max_chars="20" mouse_opaque="true" name="sculpt type control"
+			     visible="false" width="141">
+				<combo_item name="None" value="None">
+					(none)
+				</combo_item>
+				<combo_item name="Sphere" value="Sphere">
+					Sphere
+				</combo_item>
+				<combo_item name="Torus" value="Torus">
+					Torus
+				</combo_item>
+				<combo_item name="Plane" value="Plane">
+					Plane
+				</combo_item>
+				<combo_item name="Cylinder" value="Cylinder">
+					Cylinder
+				</combo_item>
 			</combo_box>
 		</panel>
-
-<!-- Features sub-tab -->
-
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     hidden="false" label="Features" left="1" mouse_opaque="false"
-		     name="Features" width="270">
+		     label="Features" left="1" mouse_opaque="false" name="Features" width="270">
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="select_single" v_pad="0" width="252">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="select_single" v_pad="0" width="252">
 				Select only one primitive to edit features.
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="edit_object" v_pad="0" width="252">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="edit_object" v_pad="0" width="252">
 				Edit object features:
 			</text>
 			<check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Flexible Path" left="10"
-			     mouse_opaque="true" name="Flexible1D Checkbox Ctrl"
+			     initial_value="false" label="Flexible Path" left="10" mouse_opaque="true"
+			     name="Flexible1D Checkbox Ctrl"
 			     tool_tip="Allows object to flex about the Z axis. (Client-side only)"
 			     width="121" />
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="1" initial_val="2" label="Softness"
-			     label_width="65" left="10" max_val="3" min_val="0" mouse_opaque="true"
-			     name="FlexNumSections" width="128" />
+			     increment="1" initial_val="2" label="Softness" label_width="65" left="10"
+			     max_val="3" min_val="0" mouse_opaque="true" name="FlexNumSections"
+			     width="128" />
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.5" initial_val="0.3" label="Gravity"
-			     label_width="65" left="10" max_val="10" min_val="-10" mouse_opaque="true"
-			     name="FlexGravity" width="128" />
+			     increment="0.5" initial_val="0.3" label="Gravity" label_width="65"
+			     left="10" max_val="10" min_val="-10" mouse_opaque="true" name="FlexGravity"
+			     width="128" />
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.5" initial_val="2" label="Drag"
-			     label_width="65" left="10" max_val="10" min_val="0" mouse_opaque="true"
-			     name="FlexFriction" width="128" />
+			     increment="0.5" initial_val="2" label="Drag" label_width="65" left="10"
+			     max_val="10" min_val="0" mouse_opaque="true" name="FlexFriction"
+			     width="128" />
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.5" initial_val="0" label="Wind"
-			     label_width="65" left="10" max_val="10" min_val="0" mouse_opaque="true"
-			     name="FlexWind" width="128" />
+			     increment="0.5" initial_val="0" label="Wind" label_width="65" left="10"
+			     max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="128" />
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.5" initial_val="1" label="Tension"
-			     label_width="65" left="10" max_val="10" min_val="0" mouse_opaque="true"
-			     name="FlexTension" width="128" />
+			     increment="0.5" initial_val="1" label="Tension" label_width="65" left="10"
+			     max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="128" />
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.01" initial_val="0" label="Force X"
-			     label_width="65" left="10" max_val="10" min_val="-10" mouse_opaque="true"
-			     name="FlexForceX" width="128" />
+			     increment="0.01" initial_val="0" label="Force X" label_width="65" left="10"
+			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceX"
+			     width="128" />
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.01" initial_val="0" label="Force Y"
-			     label_width="65" left="10" max_val="10" min_val="-10" mouse_opaque="true"
-			     name="FlexForceY" width="128" />
+			     increment="0.01" initial_val="0" label="Force Y" label_width="65" left="10"
+			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceY"
+			     width="128" />
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.01" initial_val="0" label="Force Z"
-			     label_width="65" left="10" max_val="10" min_val="-10" mouse_opaque="true"
-			     name="FlexForceZ" width="128" />
-			     
+			     increment="0.01" initial_val="0" label="Force Z" label_width="65" left="10"
+			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceZ"
+			     width="128" />
 			<check_box bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Light" left="10"
-			     mouse_opaque="true" name="Light Checkbox Ctrl"
-			     tool_tip="Causes object to emit light" width="121" />
+			     initial_value="false" label="Light" left="10" mouse_opaque="true"
+			     name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"
+			     width="121" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left_delta="0" mouse_opaque="true" name="label color" v_pad="0" width="58">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+			     mouse_opaque="true" name="label color" v_pad="0" width="58">
 				Color
 			</text>
 			<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28"
 			     can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-			     height="48" hidden="false" label="" left_delta="67" mouse_opaque="true"
-			     name="colorswatch" tool_tip="Click to open Color Picker" width="32" />
-			<spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16" hidden="false"
+			     height="48" label="" left_delta="67" mouse_opaque="true" name="colorswatch"
+			     tool_tip="Click to open Color Picker" width="32" />
+			<spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16"
 			     increment="0.1" initial_val="0.5" label="Intensity" label_width="65"
 			     left="10" max_val="1" min_val="0" mouse_opaque="true"
 			     name="Light Intensity" width="128" />
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.1" initial_val="5" label="Radius"
-			     label_width="65" left_delta="0" max_val="20" min_val="0" mouse_opaque="true"
+			     increment="0.1" initial_val="5" label="Radius" label_width="65"
+			     left_delta="0" max_val="20" min_val="0" mouse_opaque="true"
 			     name="Light Radius" width="128" />
 			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.25" initial_val="1" label="Falloff"
-			     label_width="65" left_delta="0" max_val="2" min_val="0" mouse_opaque="true"
+			     increment="0.25" initial_val="1" label="Falloff" label_width="65"
+			     left_delta="0" max_val="2" min_val="0" mouse_opaque="true"
 			     name="Light Falloff" width="128" />
 		</panel>
-
-<!-- Texture sub-tab -->
-
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     hidden="false" label="Texture" left="1" mouse_opaque="false" name="Texture"
-		     width="270">
+		     label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
 			<texture_picker allow_no_texture="false" bottom="-90" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" hidden="false"
-			     label="Texture" left="10" mouse_opaque="true" name="texture control"
+			     default_image_name="Default" follows="left|top" height="80" label="Texture"
+			     left="10" mouse_opaque="true" name="texture control"
 			     tool_tip="Click to choose a picture" width="64" />
 			<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-90"
 			     can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top"
-			     height="80" hidden="false" label="Color" left_delta="90"
-			     mouse_opaque="true" name="colorswatch"
-			     tool_tip="Click to open Color Picker" width="64" />
+			     height="80" label="Color" left_delta="90" mouse_opaque="true"
+			     name="colorswatch" tool_tip="Click to open Color Picker" width="64" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="180" mouse_opaque="true" name="color trans" v_pad="0" width="80">
+			     bottom="-11" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
+			     mouse_opaque="true" name="color trans" v_pad="0" width="80">
 				Transparency %
 			</text>
 			<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
-			     hidden="false" increment="2" initial_val="0" left="180" max_val="90"
-			     min_val="0" mouse_opaque="true" name="ColorTrans" width="80" />
-			<check_box bottom_delta="-28" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Full Bright" left="180"
-			     mouse_opaque="true" name="checkbox fullbright" width="81" />
+			     increment="2" initial_val="0" left="180" max_val="90" min_val="0"
+			     mouse_opaque="true" name="ColorTrans" width="80" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-104" drop_shadow_visible="true" follows="left|top"
+			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="tex gen" v_pad="0" width="90">
+			     left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">
+				Glow
+			</text>
+			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
+			     hidden="false" increment="0.1" initial_val="0" left="180" max_val="1"
+			     min_val="0" mouse_opaque="true" name="glow" width="80" />
+			<check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
+			     name="checkbox fullbright" width="81" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-104" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="tex gen" v_pad="0" width="90">
 				Mapping
 			</text>
 			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     hidden="false" left="10" max_chars="20" mouse_opaque="true"
-			     name="combobox texgen" width="80">
+			     left="10" max_chars="20" mouse_opaque="true" name="combobox texgen"
+			     width="80">
 				<combo_item name="Default" value="Default">
 					Default
 				</combo_item>
@@ -1020,13 +965,13 @@
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-104" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="100" mouse_opaque="true" name="label shininess" v_pad="0" width="70">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="100"
+			     mouse_opaque="true" name="label shininess" v_pad="0" width="70">
 				Shininess
 			</text>
 			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     hidden="false" left="100" max_chars="20" mouse_opaque="true"
-			     name="combobox shininess" width="70">
+			     left="100" max_chars="20" mouse_opaque="true" name="combobox shininess"
+			     width="70">
 				<combo_item name="None" value="None">
 					None
 				</combo_item>
@@ -1042,13 +987,13 @@
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-104" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="180" mouse_opaque="true" name="label bumpiness" v_pad="0" width="80">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
+			     mouse_opaque="true" name="label bumpiness" v_pad="0" width="80">
 				Bumpiness
 			</text>
 			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     hidden="false" left="180" max_chars="20" mouse_opaque="true"
-			     name="combobox bumpiness" width="80">
+			     left="180" max_chars="20" mouse_opaque="true" name="combobox bumpiness"
+			     width="80">
 				<combo_item name="None" value="None">
 					None
 				</combo_item>
@@ -1106,140 +1051,151 @@
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-158" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="tex scale" v_pad="0" width="160">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="tex scale" v_pad="0" width="160">
 				Repeats per Face
 			</text>
-			<spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" hidden="false"
-			     increment="0.1" initial_val="0" label="Horizontal (U)" label_width="90"
-			     left="20" max_val="100" min_val="0" mouse_opaque="true" name="TexScaleU"
-			     width="160" />
+			<spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+			     initial_val="0" label="Horizontal (U)" label_width="90" left="20"
+			     max_val="100" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
 			<check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Flip" left_delta="170"
-			     mouse_opaque="true" name="checkbox flip s" width="70" />
-			<spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" hidden="false"
-			     increment="0.1" initial_val="0" label="Vertical (V)" label_width="90"
-			     left="20" max_val="100" min_val="0" mouse_opaque="true" name="TexScaleV"
-			     width="160" />
+			     initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
+			     name="checkbox flip s" width="70" />
+			<spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+			     initial_val="0" label="Vertical (V)" label_width="90" left="20"
+			     max_val="100" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
 			<check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
-			     hidden="false" initial_value="false" label="Flip" left_delta="170"
-			     mouse_opaque="true" name="checkbox flip t" width="70" />
+			     initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
+			     name="checkbox flip t" width="70" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-228" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="tex rotate" v_pad="0" width="102">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="tex rotate" v_pad="0" width="102">
 				Rotation (degrees)
 			</text>
-			<spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" hidden="false"
-			     increment="1" initial_val="0" left="112" max_val="9999" min_val="-9999"
+			<spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" increment="1"
+			     initial_val="0" left="112" max_val="9999" min_val="-9999"
 			     mouse_opaque="true" name="TexRot" width="68" />
-			<text hidden="true" name="string repeats per meter">
+			<string name="string repeats per meter">
 				Repeats Per Meter
-			</text>
-			<text hidden="true" name="string repeats per face">
+			</string>
+			<string name="string repeats per face">
 				Repeats Per Face
-			</text>
+			</string>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-250" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="rpt" v_pad="0" width="160">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="rpt" v_pad="0" width="160">
 				Repeats Per Meter
 			</text>
-			<spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" hidden="false"
-			     increment="0.1" initial_val="1" left="112" max_val="10" min_val="0.1"
-			     mouse_opaque="true" name="rptctrl" width="68" />
+			<spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" increment="0.1"
+			     initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
+			     name="rptctrl" width="68" />
 			<button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Apply" label_selected="Apply"
-			     left_delta="78" mouse_opaque="true" name="button apply" scale_image="TRUE"
-			     width="75" />
+			     height="16" label="Apply" label_selected="Apply" left_delta="78"
+			     mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-288" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-			     left="10" mouse_opaque="true" name="tex offset" v_pad="0" width="160">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="tex offset" v_pad="0" width="160">
 				Offset
 			</text>
-			<spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" hidden="false"
-			     increment="0.1" initial_val="0" label="Horizontal (U)" label_width="90"
-			     left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU"
-			     width="160" />
+			<spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+			     initial_val="0" label="Horizontal (U)" label_width="90" left="20"
+			     max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
 			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     hidden="false" increment="0.1" initial_val="0" label="Vertical (V)"
-			     label_width="90" left="20" max_val="1" min_val="-1" mouse_opaque="true"
-			     name="TexOffsetV" width="160" />
+			     increment="0.1" initial_val="0" label="Vertical (V)" label_width="90"
+			     left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
+			     width="160" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-352" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
-			     left="10" mouse_opaque="true" name="textbox autofix" v_pad="0" width="160">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+			     mouse_opaque="true" name="textbox autofix" v_pad="0" width="160">
 				Align media texture
 (must load first)
 			</text>
 			<button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" hidden="false" label="Align" label_selected="Align" left="112"
+			     height="16" label="Align" label_selected="Align" left="112"
 			     mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
 		</panel>
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     hidden="false" label="Content" left="1" mouse_opaque="false"
-		     name="Contents" width="270">
+		     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
 			<button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
-			     hidden="false" label="New Script..." label_selected="New Script..."
-			     left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
-			     width="130" />
-			<panel bottom_delta="-330" follows="left|top" height="325" hidden="false" left="10"
+			     label="New Script..." label_selected="New Script..." left="10"
+			     mouse_opaque="true" name="button new script" scale_image="TRUE" width="130" />
+			<panel bottom_delta="-330" follows="left|top" height="325" left="10"
 			     mouse_opaque="true" name="ContentsInventory" width="252" />
 		</panel>
 	</tab_container>
-
-<!-- Land Info sub-tab -->
-
-	<panel bottom="-550" follows="left|top" height="384" hidden="false" left="0"
-	     mouse_opaque="true" name="land info panel" width="272">
+	<panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
+	     name="land info panel" width="272">
 		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 		     bottom="-18" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-		     left="4" mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+		     mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
 			Price: L$[PRICE] for [AREA] sq. m.
 		</text>
 		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 		     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-		     left="4" mouse_opaque="true" name="label_area" v_pad="0" width="72">
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+		     mouse_opaque="true" name="label_area" v_pad="0" width="72">
 			Area: [AREA] sq. m.
 		</text>
 		<button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"
-		     height="20" hidden="false" label="Buy Land..." label_selected="Buy Land..."
-		     left="76" mouse_opaque="true" name="button buy land" scale_image="TRUE"
-		     width="102" />
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" hidden="false" label="Abandon Land..."
-		     label_selected="Abandon Land..." left="76" mouse_opaque="true"
-		     name="button abandon land" scale_image="TRUE" width="102" />
+		     height="20" label="Buy Land..." label_selected="Buy Land..." left="76"
+		     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />
 		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" hidden="false" label="Subdivide..."
-		     label_selected="Subdivide..." left="76" mouse_opaque="true"
-		     name="button subdivide land" scale_image="TRUE" width="102" />
+		     height="20" label="Abandon Land..." label_selected="Abandon Land..."
+		     left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
+		     width="102" />
 		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" hidden="false" label="Join..." label_selected="Join..."
-		     left="76" mouse_opaque="true" name="button join land" scale_image="TRUE"
+		     height="20" label="Subdivide..." label_selected="Subdivide..." left="76"
+		     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
 		     width="102" />
+		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+		     height="20" label="Join..." label_selected="Join..." left="76"
+		     mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" />
 		<button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center"
-		     height="20" hidden="false" label="About Land..."
-		     label_selected="About Land..." left="76" mouse_opaque="true"
-		     name="button about land" scale_image="TRUE" width="102" />
+		     height="20" label="About Land..." label_selected="About Land..." left="76"
+		     mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />
 	</panel>
-
-	<text hidden="true" name="status_rotate">Drag colored bands to rotate object</text>
-	<text hidden="true" name="status_scale">Click and drag to stretch selected side</text>
-	<text hidden="true" name="status_move">Drag to move, shift-drag to copy</text>
-	<text hidden="true" name="status_modifyland">Click and hold to modify land</text>
-	<text hidden="true" name="status_camera">Click and drag to change view</text>
-	<text hidden="true" name="status_grab">Drag to move objects, Ctrl to lift, Ctrl-Shift to spin</text>
-	<text hidden="true" name="status_place">Click in the world to create, shift-click to select</text>
-	<text hidden="true" name="status_selectland">Click and drag to select land</text>
-
-	<text hidden="true" name="grid_screen_text">Screen</text>
-	<text hidden="true" name="grid_local_text">Local</text>
-	<text hidden="true" name="grid_world_text">World</text>
-	<text hidden="true" name="grid_reference_text">Reference</text>
-	<text hidden="true" name="grid_attachment_text">Attachment</text>
-
+	<string name="status_rotate">
+		Drag colored bands to rotate object
+	</string>
+	<string name="status_scale">
+		Click and drag to stretch selected side
+	</string>
+	<string name="status_move">
+		Drag to move, shift-drag to copy
+	</string>
+	<string name="status_modifyland">
+		Click and hold to modify land
+	</string>
+	<string name="status_camera">
+		Click and drag to change view
+	</string>
+	<string name="status_grab">
+		Drag to move objects, Ctrl to lift, Ctrl-Shift to spin
+	</string>
+	<string name="status_place">
+		Click in the world to create, shift-click to select
+	</string>
+	<string name="status_selectland">
+		Click and drag to select land
+	</string>
+	<string name="grid_screen_text">
+		Screen
+	</string>
+	<string name="grid_local_text">
+		Local
+	</string>
+	<string name="grid_world_text">
+		World
+	</string>
+	<string name="grid_reference_text">
+		Reference
+	</string>
+	<string name="grid_attachment_text">
+		Attachment
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml
index 68f2b6c..a46671f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml
@@ -6,30 +6,17 @@
 	     name="title_text" width="400">
 		Loading...
 	</text>
-	<scroll_list
-		name="objects_list"
-		bottom_delta="-150"
-		left="10"
-		width="430"
-		height="150"
-		multi_select="true"
-		draw_border="true"
-		draw_heading="true"
-        follows="left|top|bottom|right">
-        <column name="score" label="Score" width="55" />
-        <column name="name" label="Name" dynamicwidth="true" />
-        <column name="owner" label="Owner" width="105" />
-        <column name="location" label="Location" width="130" />
-    </scroll_list>
-    <text name="id_text"
-        left="10"
-        bottom_delta="-30"
-        width="100"
-        height="20"
-        follows="left|bottom"
-		font="SansSerifSmall"
-    >
-Object ID:
+	<scroll_list bottom_delta="-150" draw_border="true" draw_heading="true"
+	     follows="left|top|bottom|right" height="150" left="10" multi_select="true"
+	     name="objects_list" width="430">
+		<column label="Score" name="score" width="55" />
+		<column dynamicwidth="true" label="Name" name="name" />
+		<column label="Owner" name="owner" width="105" />
+		<column label="Location" name="location" width="130" />
+	</scroll_list>
+	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
+	     left="10" name="id_text" width="100">
+		Object ID:
 	</text>
 	<line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false"
 	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
@@ -64,25 +51,25 @@ Object ID:
 	     name="disable_all_btn" width="130" />
 	<button bottom="35" follows="bottom|right" height="20" label="Refresh"
 	     name="refresh_btn" right="-10" width="100" />
-	<text hidden="true" name="top_scripts_title">
+	<string name="top_scripts_title">
 		Top Scripts
-	</text>
-	<text hidden="true" name="top_scripts_text">
+	</string>
+	<string name="top_scripts_text">
 		[COUNT] scripts taking a total of [TIME] ms
-	</text>
-	<text hidden="true" name="scripts_score_label">
+	</string>
+	<string name="scripts_score_label">
 		Time
-	</text>
-	<text hidden="true" name="top_colliders_title">
+	</string>
+	<string name="top_colliders_title">
 		Top Colliders
-	</text>
-	<text hidden="true" name="top_colliders_text">
+	</string>
+	<string name="top_colliders_text">
 		Top [COUNT] objects experiencing many potential collisions
-	</text>
-	<text hidden="true" name="colliders_score_label">
+	</string>
+	<string name="colliders_score_label">
 		Score
-	</text>
-	<text hidden="true" name="none_descriptor">
+	</string>
+	<string name="none_descriptor">
 		None found.
-	</text>
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tos.xml b/linden/indra/newview/skins/xui/en-us/floater_tos.xml
index f002bf2..4f0a4da 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tos.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="false" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="500" min_height="100" min_width="100"
-     name="modal container" title=" " width="600">
+     name="modal container" title="" width="600">
 	<button bottom="-484" enabled="false" font="SansSerif" halign="center" height="20"
 	     label="Continue" label_selected="Continue" left="376" mouse_opaque="true"
 	     name="Continue" width="100" />
@@ -43,7 +43,7 @@ you must accept the agreement.
 	     name="tos_html"
 	     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#ffffff%22 text=%22000000%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
 	     text_readonly_color="1, 1, 1, 1" width="568" word_wrap="true" />
-	<text hidden="true" name="real_url">
+	<string name="real_url">
 		http://secondlife.com/app/tos/
-	</text>
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_url_entry.xml b/linden/indra/newview/skins/xui/en-us/floater_url_entry.xml
new file mode 100644
index 0000000..64926c9
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_url_entry.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="87" max_height="91" min_height="87"
+     min_width="500" name="url_entry" title="" width="500">
+	<text bottom="-20" follows="top|left" height="15" left="20" name="media_label"
+	     top="-20">
+		Media URL:
+	</text>
+	<combo_box allow_text_entry="true" bottom="-35" follows="left|top|right" height="19"
+	     left="90" max_chars="255" max_length="550" name="media_entry" width="370" />
+	<button bottom="10" bottom_delta="-35" follows="top|left" height="20" label="OK"
+	     left="20" name="ok_btn" width="64" />
+	<button bottom="10" bottom_delta="0" follows="top|left" height="20" label="Cancel"
+	     left="112" name="cancel_btn" width="64" />
+	<button bottom="10" bottom_delta="0" follows="top|left" height="20" label="Cancel"
+	     left="112" name="cancel_btn2" width="64" />
+	<button bottom="10" bottom_delta="0" follows="top|right" height="20" label="Clear"
+	     name="clear_btn" right="460" width="64" />
+	<text bottom_delta="2" follows="bottom|left" height="15" left="220"
+	     name="loading_label" visible="false">
+		Loading...
+	</text>
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml b/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml
index 536e578..6ed2ea4 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml
@@ -1,17 +1,19 @@
-<floater bottom="0" can_resize="false" can_minimize="true" height="300" left="0" name="floater_voice_wizard"
-     title="Voice Setup" width="420">
-     <tab_container name="wizard_tabs" hide_tabs="true" bottom="30" left="4" top="-20" right="-2" tab_position="bottom">
-	<panel bottom="0" filename="panel_voice_enable.xml" left="0" right="0"/>
-	<panel bottom="0" filename="panel_voice_options.xml" left="0" right="0"/>
-	<panel bottom="0" name="device_settings" filename="panel_audio_device.xml" left="0" right="0"/>
-     </tab_container>
-     <panel border="false" bottom="8" height="20" left="8" mouse_opaque="true"
-	    name="content_panel" width="404">
-       <!--<button bottom="0" height="20" label="Help" left="0" name="help_btn" width="70" />-->
-       <button bottom="0" height="20" label="Previous" left="55" name="back_btn" width="85" />
-       <button bottom="0" height="20" label="Next" left_delta="90" name="next_btn" width="85" />
-       <button bottom="0" height="20" label="Finish" left_delta="90" name="ok_btn" width="85" />
-       <button bottom="0" height="20" label="Cancel" left_delta="90" name="cancel_btn"
-	       width="80" />
-     </panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="0" can_minimize="true" can_resize="false" height="300" left="0"
+     name="floater_voice_wizard" title="Voice Setup" width="420">
+	<tab_container bottom="30" hide_tabs="true" left="4" name="wizard_tabs" right="-2"
+	     tab_position="bottom" top="-20">
+		<panel bottom="0" filename="panel_voice_enable.xml" left="0" right="0" />
+		<panel bottom="0" filename="panel_voice_options.xml" left="0" right="0" />
+		<panel bottom="0" filename="panel_audio_device.xml" left="0" name="device_settings"
+		     right="0" />
+	</tab_container>
+	<panel border="false" bottom="8" height="20" left="8" mouse_opaque="true"
+	     name="content_panel" width="404">
+		<button bottom="0" height="20" label="Previous" left="55" name="back_btn" width="85" />
+		<button bottom="0" height="20" label="Next" left_delta="90" name="next_btn" width="85" />
+		<button bottom="0" height="20" label="Finish" left_delta="90" name="ok_btn" width="85" />
+		<button bottom="0" height="20" label="Cancel" left_delta="90" name="cancel_btn"
+		     width="80" />
+	</panel>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_water.xml b/linden/indra/newview/skins/xui/en-us/floater_water.xml
new file mode 100644
index 0000000..9182c17
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_water.xml
@@ -0,0 +1,260 @@
+<?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" hidden="false" 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" hidden="false"
+	     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"
+	     hidden="false" label="New" label_selected="New" left_delta="170"
+	     mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="50" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     hidden="false" label="Save" label_selected="Save" left_delta="60"
+	     mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="50" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     hidden="false" label="Delete" label_selected="Delete" left_delta="60"
+	     mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="50" />
+	<tab_container bottom="-240" follows="left|top" height="180" hidden="false" 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"
+		     hidden="false" 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" hidden="false"
+			     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="105" 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" hidden="false" 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" hidden="false"
+			     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="135" 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" hidden="false"
+			     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="155" 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" hidden="false"
+			     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="391" 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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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="325" 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" hidden="false"
+			     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="330" 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" hidden="false"
+			     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="598" 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" hidden="false"
+			     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="598" 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" hidden="false"
+			     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="565" 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"
+		     hidden="false" 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" hidden="false"
+			     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="120" 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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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="130" 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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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="315" 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/xui/en-us/floater_wearable_save_as.xml b/linden/indra/newview/skins/xui/en-us/floater_wearable_save_as.xml
index 5f39f64..0284e55 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_wearable_save_as.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater border="true" bottom="372" can_close="false" can_drag_on_left="false"
      can_minimize="false" can_resize="false" can_tear_off="true" enabled="true"
-     height="100" hidden="false" left="415" min_height="100" min_width="100"
-     mouse_opaque="true" name="modal container" title=" " width="240">
+     height="100" left="415" min_height="100" min_width="100"
+     mouse_opaque="true" name="modal container" title="" width="240">
 	<button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Save" label_selected="Save" left="20"
-	     mouse_opaque="true" name="Save" scale_image="true" width="82" />
+	     label="Save" label_selected="Save" left="20" mouse_opaque="true"
+	     name="Save" scale_image="true" width="82" />
 	<button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
-	     hidden="false" label="Cancel" label_selected="Cancel" left="138"
-	     mouse_opaque="true" name="Cancel" scale_image="true" width="82" />
+	     label="Cancel" label_selected="Cancel" left="138" mouse_opaque="true"
+	     name="Cancel" scale_image="true" width="82" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-	     left="20" mouse_opaque="true" name="Save item as:" v_pad="0" width="200">
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="20"
+	     mouse_opaque="true" name="Save item as:" v_pad="0" width="200">
 		Save item as:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-50"
 	     enabled="true" follows="left|top" font="SansSerif"
-	     handle_edit_keys_directly="true" height="20" hidden="false" left="20"
-	     max_length="63" mouse_opaque="true" name="name ed"
-	     select_all_on_focus_received="false" select_on_focus="false" width="200">
+	     handle_edit_keys_directly="true" height="20" left="20" max_length="63"
+	     mouse_opaque="true" name="name ed" select_all_on_focus_received="false"
+	     select_on_focus="false" width="200">
 		New [DESC]
 	</line_editor>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
new file mode 100644
index 0000000..30ca821
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
@@ -0,0 +1,593 @@
+<?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" hidden="false" 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" hidden="false"
+	     left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
+	     width="110">
+		Sky 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="WLPresetsCombo"
+	     width="150" />
+	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+	     hidden="false" label="New" label_selected="New" left_delta="170"
+	     mouse_opaque="true" name="WLNewPreset" scale_image="true" width="50" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     hidden="false" label="Save" label_selected="Save" left_delta="60"
+	     mouse_opaque="true" name="WLSavePreset" scale_image="true" width="50" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     hidden="false" label="Delete" label_selected="Delete" left_delta="60"
+	     mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="50" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     hidden="false" label="Day Cycle Editor" label_selected="Day Cycle Editor"
+	     left_delta="160" mouse_opaque="true" name="WLDayCycleMenuButton"
+	     scale_image="true" width="120" />
+	<tab_container bottom="-220" follows="left|top" height="160" hidden="false" 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"
+		     hidden="false" 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" hidden="false"
+			     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="85" 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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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="87" 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" hidden="false"
+			     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="320" 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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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="325" 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" hidden="false"
+			     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="582" 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" hidden="false"
+			     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="589" 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" hidden="false"
+			     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="555" 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"
+		     hidden="false" 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" hidden="false"
+			     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="108" 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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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="142" 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" hidden="false"
+			     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="294" 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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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="307" 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" hidden="false"
+			     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="540" 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" hidden="false"
+			     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="564" 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" hidden="false"
+			     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="570" 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"
+		     hidden="false" 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" hidden="false"
+			     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="80" 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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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="110" 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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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="335" 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" hidden="false"
+			     left="240" 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="310" 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" hidden="false"
+			     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="390" 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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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" hidden="false"
+			     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="558" name="WLCloudScrollXHelp" width="18" />
+			<check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Lock" left="580" 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" hidden="false"
+			     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="558" name="WLCloudScrollYHelp" width="18" />
+			<check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Lock" left="580" 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/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
index b32091c..bd74b05 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
@@ -1,6 +1,7 @@
+<?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="711" min_height="520" min_width="410" name="worldmap"
-     rect_control="FloaterWorldMapRect" title="World Map" width="1243">
+     rect_control="FloaterWorldMapRect2" title="World Map" width="1243">
 	<tab_container bottom="-701" follows="left|top|right|bottom" height="681" left="15"
 	     mouse_opaque="false" name="maptab" tab_position="top" width="995">
 		<panel bottom="-680" follows="left|top|right|bottom" height="664" label="Objects"
@@ -82,7 +83,7 @@
 		Infohub
 	</text>
 	<check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label=" "
+	     font="SansSerifSmall" height="16" initial_value="false" label=""
 	     left_delta="70" mouse_opaque="true" name="infohub_chk" width="55" />
 	<icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
 	     image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"
@@ -94,7 +95,7 @@
 		Telehub
 	</text>
 	<check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label=" "
+	     font="SansSerifSmall" height="16" initial_value="false" label=""
 	     left_delta="70" mouse_opaque="true" name="telehubchk" width="55" />
 	<icon bottom="-76" color="1, 1, 1, 1" follows="top|right" height="16"
 	     image_name="icon_popular.tga" left="1123" mouse_opaque="true"
@@ -106,7 +107,7 @@
 		Popular
 	</text>
 	<check_box bottom="-76" control_name="MapShowPopular" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label=" "
+	     font="SansSerifSmall" height="16" initial_value="false" label=""
 	     left_delta="80" mouse_opaque="true" name="popular_chk" width="55" />
 	<icon bottom="-96" color="1, 1, 1, 1" follows="top|right" height="16"
 	     image_name="icon_for_sale.tga" left="1123" mouse_opaque="true"
@@ -118,7 +119,7 @@
 		Land For Sale
 	</text>
 	<check_box bottom="-96" control_name="MapShowLandForSale" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label=" "
+	     font="SansSerifSmall" height="16" initial_value="false" label=""
 	     left_delta="80" mouse_opaque="true" name="land_for_sale_chk" width="55" />
 	<icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
 	     image_name="map_event.tga" left="1123" mouse_opaque="true" name="event"
@@ -130,7 +131,7 @@
 		Events
 	</text>
 	<check_box bottom="-116" control_name="MapShowEvents" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label=" "
+	     font="SansSerifSmall" height="16" initial_value="false" label=""
 	     left_delta="80" mouse_opaque="true" name="event_chk" width="55" />
 	<icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
 	     image_name="map_event_mature.tga" left="1123" mouse_opaque="true"
@@ -142,7 +143,7 @@
 		Events (M)
 	</text>
 	<check_box bottom="-136" control_name="ShowMatureEvents" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="true" label=" "
+	     font="SansSerifSmall" height="16" initial_value="true" label=""
 	     left_delta="80" mouse_opaque="true" name="event_mature_chk" width="55" />
 	<icon bottom="-181" color="0.5, 0, 0, 1" follows="top|right" height="16"
 	     image_name="map_track_16.tga" left="1013" mouse_opaque="true"
@@ -169,7 +170,7 @@
 	     name="location_icon" width="16" />
 	<line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name"
 	     left_delta="20" name="location" select_on_focus="true"
-	     tool_tip="Type the name of a region" width="140"/>
+	     tool_tip="Type the name of a region" width="140" />
 	<button bottom_delta="0" follows="top|right" font="SansSerif" halign="center"
 	     height="20" label="Search" left_delta="145" mouse_opaque="true"
 	     name="DoSearch" tool_tip="Search for region" width="60" />
@@ -220,9 +221,10 @@
 	     height="20" label="Show My Location" label_selected="Show My Location"
 	     left_delta="100" mouse_opaque="true" name="Show My Location"
 	     tool_tip="Center map on your avatar&apos;s location" width="125" />
-	<button bottom_delta="-24" enabled="false" follows="bottom|right" height="20"
-	     label="Copy SLURL to clipboard" left="-230" width="222" name="copy_slurl" font="SansSerif"
-	     tool_tip="Copies current location as SLURL to be used on the web."/>
+	<button bottom_delta="-24" enabled="false" follows="bottom|right" font="SansSerif"
+	     height="20" label="Copy SLURL to clipboard" left="-230" name="copy_slurl"
+	     tool_tip="Copies current location as SLURL to be used on the web."
+	     width="222" />
 	<slider bottom="-697" can_edit_text="false" decimal_digits="3" follows="right|bottom"
 	     height="16" increment="0.2" initial_val="48.5029" label="Zoom" left="-230"
 	     max_val="0" min_val="-8" mouse_opaque="true" name="zoom slider"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
index c1b72d4..925c2a4 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
@@ -1,259 +1,250 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu bottom="100" color="0, 0, 0, 1" drop_shadow="true" height="101" hidden="false"
-     left="100" mouse_opaque="false" name="Popup" opaque="true" width="128">
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Buy" left="0"
-	     mouse_opaque="true" name="Task Buy" width="128">
+<menu bottom="100" color="0, 0, 0, 1" drop_shadow="true" height="101" left="100"
+     mouse_opaque="false" name="Popup" opaque="true" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Buy" left="0" mouse_opaque="true"
+	     name="Task Buy" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="task_buy" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Open" left="0"
-	     mouse_opaque="true" name="Task Open" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Open" left="0" mouse_opaque="true"
+	     name="Task Open" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="task_open" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Play" left="0"
-	     mouse_opaque="true" name="Task Play" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Play" left="0" mouse_opaque="true"
+	     name="Task Play" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="task_play" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Properties" left="0"
-	     mouse_opaque="true" name="Task Properties" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Properties" left="0" mouse_opaque="true"
+	     name="Task Properties" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="task_properties" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Rename" left="0"
-	     mouse_opaque="true" name="Task Rename" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Rename" left="0" mouse_opaque="true"
+	     name="Task Rename" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="rename" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Delete" left="0"
-	     mouse_opaque="true" name="Task Remove" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Delete" left="0" mouse_opaque="true"
+	     name="Task Remove" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Empty Trash" left="0"
-	     mouse_opaque="true" name="Empty Trash" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Empty Trash" left="0" mouse_opaque="true"
+	     name="Empty Trash" width="128">
 		<on_click filter="" function="Inventory.EmptyTrash" userdata="rename" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Empty Lost And Found"
-	     left="0" mouse_opaque="true" name="Empty Lost And Found" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Empty Lost And Found" left="0"
+	     mouse_opaque="true" name="Empty Lost And Found" width="128">
 		<on_click filter="" function="Inventory.EmptyLostAndFound" userdata="rename" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Folder" left="0"
-	     mouse_opaque="true" name="New Folder" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="New Folder" left="0" mouse_opaque="true"
+	     name="New Folder" width="128">
 		<on_click filter="" function="Inventory.DoCreate" userdata="category" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Script" left="0"
-	     mouse_opaque="true" name="New Script" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="New Script" left="0" mouse_opaque="true"
+	     name="New Script" width="128">
 		<on_click filter="" function="Inventory.DoCreate" userdata="lsl" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Note" left="0"
-	     mouse_opaque="true" name="New Note" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="New Note" left="0" mouse_opaque="true"
+	     name="New Note" width="128">
 		<on_click filter="" function="Inventory.DoCreate" userdata="notecard" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Gesture" left="0"
-	     mouse_opaque="true" name="New Gesture" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="New Gesture" left="0" mouse_opaque="true"
+	     name="New Gesture" width="128">
 		<on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
 	</menu_item_call>
-	<menu bottom_delta="0" color="0, 0, 0, 1" drop_shadow="true" height="175"
-	     hidden="false" left="0" mouse_opaque="false" name="New Clothes"
-	     opaque="true" tear_off="false" width="125">
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Shirt" left="0"
-		     mouse_opaque="true" name="New Shirt" width="128">
+	<menu bottom_delta="0" color="0, 0, 0, 1" drop_shadow="true" height="175" left="0"
+	     mouse_opaque="false" name="New Clothes" opaque="true" tear_off="false"
+	     width="125">
+		<menu_item_call bottom_delta="-18" height="18" label="New Shirt" left="0" mouse_opaque="true"
+		     name="New Shirt" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="shirt" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Pants" left="0"
-		     mouse_opaque="true" name="New Pants" width="128">
+		<menu_item_call bottom_delta="-18" height="18" label="New Pants" left="0" mouse_opaque="true"
+		     name="New Pants" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="pants" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Shoes" left="0"
-		     mouse_opaque="true" name="New Shoes" width="128">
+		<menu_item_call bottom_delta="-18" height="18" label="New Shoes" left="0" mouse_opaque="true"
+		     name="New Shoes" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="shoes" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Socks" left="0"
-		     mouse_opaque="true" name="New Socks" width="128">
+		<menu_item_call bottom_delta="-18" height="18" label="New Socks" left="0" mouse_opaque="true"
+		     name="New Socks" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="socks" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Jacket" left="0"
-		     mouse_opaque="true" name="New Jacket" width="128">
+		<menu_item_call bottom_delta="-18" height="18" label="New Jacket" left="0" mouse_opaque="true"
+		     name="New Jacket" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="jacket" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Skirt" left="0"
-		     mouse_opaque="true" name="New Skirt" width="128">
+		<menu_item_call bottom_delta="-18" height="18" label="New Skirt" left="0" mouse_opaque="true"
+		     name="New Skirt" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="skirt" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Gloves" left="0"
-		     mouse_opaque="true" name="New Gloves" width="128">
+		<menu_item_call bottom_delta="-18" height="18" label="New Gloves" left="0" mouse_opaque="true"
+		     name="New Gloves" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="gloves" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Undershirt" left="0"
+		<menu_item_call bottom_delta="-18" height="18" label="New Undershirt" left="0"
 		     mouse_opaque="true" name="New Undershirt" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="undershirt" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Underpants" left="0"
+		<menu_item_call bottom_delta="-18" height="18" label="New Underpants" left="0"
 		     mouse_opaque="true" name="New Underpants" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
 		</menu_item_call>
 	</menu>
-	<menu bottom_delta="0" color="0, 0, 0, 1" drop_shadow="true" height="175"
-	     hidden="false" left="0" mouse_opaque="false" name="New Body Parts"
-	     opaque="true" tear_off="false" width="125">
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Shape" left="0"
-		     mouse_opaque="true" name="New Shape" width="128">
+	<menu bottom_delta="0" color="0, 0, 0, 1" drop_shadow="true" height="175" left="0"
+	     mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"
+	     width="125">
+		<menu_item_call bottom_delta="-18" height="18" label="New Shape" left="0" mouse_opaque="true"
+		     name="New Shape" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="shape" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Skin" left="0"
-		     mouse_opaque="true" name="New Skin" width="128">
+		<menu_item_call bottom_delta="-18" height="18" label="New Skin" left="0" mouse_opaque="true"
+		     name="New Skin" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="skin" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Hair" left="0"
-		     mouse_opaque="true" name="New Hair" width="128">
+		<menu_item_call bottom_delta="-18" height="18" label="New Hair" left="0" mouse_opaque="true"
+		     name="New Hair" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="hair" />
 		</menu_item_call>
-		<menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Eyes" left="0"
-		     mouse_opaque="true" name="New Eyes" width="128">
+		<menu_item_call bottom_delta="-18" height="18" label="New Eyes" left="0" mouse_opaque="true"
+		     name="New Eyes" width="128">
 			<on_click filter="" function="Inventory.DoCreate" userdata="eyes" />
 		</menu_item_call>
 	</menu>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Teleport" left="0" 
-	     mouse_opaque="true" name="Landmark Open" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Teleport" left="0" mouse_opaque="true"
+	     name="Landmark Open" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Open" left="0"
-	     mouse_opaque="true" name="Animation Open" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Open" left="0" mouse_opaque="true"
+	     name="Animation Open" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Open" left="0"
-	     mouse_opaque="true" name="Sound Open" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Open" left="0" mouse_opaque="true"
+	     name="Sound Open" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Purge Item" left="0"
-	     mouse_opaque="true" name="Purge Item" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Purge Item" left="0" mouse_opaque="true"
+	     name="Purge Item" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="purge" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Restore Item" left="0"
+	<menu_item_call bottom_delta="-18" height="18" label="Restore Item" left="0"
 	     mouse_opaque="true" name="Restore Item" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="restore" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Open" left="0"
-	     mouse_opaque="true" name="Open" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Open" left="0" mouse_opaque="true"
+	     name="Open" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Properties" left="0"
-	     mouse_opaque="true" name="Properties" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Properties" left="0" mouse_opaque="true"
+	     name="Properties" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="properties" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Rename" left="0"
-	     mouse_opaque="true" name="Rename" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Rename" left="0" mouse_opaque="true"
+	     name="Rename" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="rename" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Copy Asset UUID" left="0"
+	<menu_item_call bottom_delta="-18" height="18" label="Copy Asset UUID" left="0"
 	     mouse_opaque="true" name="Copy Asset UUID" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
 	</menu_item_call>
 	<menu_item_separator name="Copy Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Copy" left="0"
-	     mouse_opaque="true" name="Copy" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
+	     name="Copy" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Paste" left="0"
-	     mouse_opaque="true" name="Paste" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
+	     name="Paste" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="paste" />
 	</menu_item_call>
 	<menu_item_separator name="Paste Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Delete" left="0"
-	     mouse_opaque="true" name="Delete" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Delete" left="0" mouse_opaque="true"
+	     name="Delete" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
 	</menu_item_call>
 	<menu_item_separator name="Folder Wearables Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Take Off Items" left="0"
+	<menu_item_call bottom_delta="-18" height="18" label="Take Off Items" left="0"
 	     mouse_opaque="true" name="Take Off Items" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="removefromoutfit" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Add To Outfit" left="0"
+	<menu_item_call bottom_delta="-18" height="18" label="Add To Outfit" left="0"
 	     mouse_opaque="true" name="Add To Outfit" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="addtooutfit" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Replace Outfit" left="0"
+	<menu_item_call bottom_delta="-18" height="18" label="Replace Outfit" left="0"
 	     mouse_opaque="true" name="Replace Outfit" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="replaceoutfit" />
 	</menu_item_call>
 	<menu_item_separator name="Calling Card Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false"
-	     label="Start Conference Chat" left="0" mouse_opaque="true"
-	     name="Conference Chat Folder" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Start Conference Chat" left="0"
+	     mouse_opaque="true" name="Conference Chat Folder" width="128">
 		<on_click filter="" function="Inventory.BeginIMSession" userdata="everyone" />
 	</menu_item_call>
 	<menu_item_separator name="Sound Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Play" left="0"
-	     mouse_opaque="true" name="Sound Play" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Play" left="0" mouse_opaque="true"
+	     name="Sound Play" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
 	</menu_item_call>
 	<menu_item_separator name="Landmark Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="About Landmark"
-	     left="0" mouse_opaque="true" name="Teleport To Landmark" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="About Landmark" left="0"
+	     mouse_opaque="true" name="Teleport To Landmark" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="about" />
 	</menu_item_call>
 	<menu_item_separator name="Animation Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Play in World" left="0"
+	<menu_item_call bottom_delta="-18" height="18" label="Play in World" left="0"
 	     mouse_opaque="true" name="Animation Play" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="playworld" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Play Locally" left="0"
+	<menu_item_call bottom_delta="-18" height="18" label="Play Locally" left="0"
 	     mouse_opaque="true" name="Animation Audition" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="playlocal" />
 	</menu_item_call>
 	<menu_item_separator name="Send Instant Message Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Send Instant Message"
-	     left="0" mouse_opaque="true" name="Send Instant Message" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Send Instant Message" left="0"
+	     mouse_opaque="true" name="Send Instant Message" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="begin_im" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Offer Teleport..."
-	     left="0" mouse_opaque="true" name="Offer Teleport..." width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Offer Teleport..." left="0"
+	     mouse_opaque="true" name="Offer Teleport..." width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="lure" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false"
-	     label="Start Conference Chat" left="0" mouse_opaque="true"
-	     name="Conference Chat" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Start Conference Chat" left="0"
+	     mouse_opaque="true" name="Conference Chat" width="128">
 		<on_click filter="" function="Inventory.BeginIMSession" userdata="selected" />
 	</menu_item_call>
 	<menu_item_separator name="Gesture Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Activate" left="0"
-	     mouse_opaque="true" name="Activate" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Activate" left="0" mouse_opaque="true"
+	     name="Activate" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="activate" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Deactivate" left="0"
-	     mouse_opaque="true" name="Deactivate" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Deactivate" left="0" mouse_opaque="true"
+	     name="Deactivate" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" />
 	</menu_item_call>
-
-<!-- from this line down the attach session is read in reverse order -->	
-
 	<menu_item_separator name="Attach Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Detach From Yourself"
-	     left="0" mouse_opaque="true" name="Detach From Yourself" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Detach From Yourself" left="0"
+	     mouse_opaque="true" name="Detach From Yourself" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="detach" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Wear" left="0"
-	     mouse_opaque="true" name="Object Wear" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true"
+	     name="Object Wear" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
 	</menu_item_call>
-	<menu bottom_delta="-18" height="18" hidden="false" label="Attach To" left="0"
-	     mouse_opaque="true" name="Attach To" opaque="true" tear_off="false"
-	     width="128" />
-	<menu bottom_delta="-18" height="18" hidden="false" label="Attach To HUD" left="0"
+	<menu bottom_delta="-18" height="18" label="Attach To" left="0" mouse_opaque="true"
+	     name="Attach To" opaque="true" tear_off="false" width="128" />
+	<menu bottom_delta="-18" height="18" label="Attach To HUD" left="0"
 	     mouse_opaque="true" name="Attach To HUD" opaque="true" tear_off="false"
 	     width="128" />
-		 
-<!-- from this line down the wearable session is read in reverse order -->		
-	 
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Edit" left="0"
-	     mouse_opaque="true" name="Wearable Edit" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Edit" left="0" mouse_opaque="true"
+	     name="Wearable Edit" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="edit" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Wear" left="0"
-	     mouse_opaque="true" name="Wearable Wear" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true"
+	     name="Wearable Wear" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="wear" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Take Off" left="0"
-	     mouse_opaque="true" name="Take Off" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Take Off" left="0" mouse_opaque="true"
+	     name="Take Off" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="take_off" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="--no options--" left="0"
+	<menu_item_call bottom_delta="-18" height="18" label="--no options--" left="0"
 	     mouse_opaque="true" name="--no options--" width="128" />
-	<menu_item_separator name="Wearable Separator" />	 
+	<menu_item_separator name="Wearable Separator" />
 </menu>
diff --git a/linden/indra/newview/skins/xui/en-us/menu_login.xml b/linden/indra/newview/skins/xui/en-us/menu_login.xml
index 02addf3..92170ae 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_login.xml
@@ -1,36 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" drop_shadow="false" enabled="true"
-     follows="left|top|right" height="18" hidden="false" left="0"
-     mouse_opaque="true" name="Login Menu" opaque="true" tear_off="false"
-     width="802">
-	<menu bottom="273" drop_shadow="true" enabled="true" height="263"
-	     hidden="false" label="File" left="0" mouse_opaque="false" name="File"
-	     opaque="true" tear_off="false" create_jump_keys="true" width="243">
-		<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Quit" left="0"
+<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
+     tear_off="false" width="802">
+	<menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="263" label="File" left="0" mouse_opaque="false" name="File"
+	     opaque="true" tear_off="false" width="243">
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
 		     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
 			<on_click function="File.Quit" userdata="" />
 		</menu_item_call>
 	</menu>
-	<menu bottom="97" drop_shadow="true" enabled="true" height="439"
-	     hidden="false" label="Edit" left="38" mouse_opaque="false" name="Edit"
-	     opaque="true" tear_off="false" create_jump_keys="true" width="153">
-		<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Preferences..."
-		     left="0" mouse_opaque="true" name="Preferences..." shortcut="control|P"
-		     width="153">
+	<menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
+	     opaque="true" tear_off="false" width="153">
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
+		     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
 			<on_click function="ShowFloater" userdata="preferences" />
 		</menu_item_call>
 	</menu>
-	<menu bottom="219" drop_shadow="true" enabled="true" height="317"
-	     hidden="false" label="Help" left="80" mouse_opaque="false" name="Help"
-	     opaque="true" tear_off="falsoe" create_jump_keys="true" width="166">
-	     <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Second Life Help"
-		     left="0" mouse_opaque="true" name="Second Life Help" shortcut="F1"
-		     width="166">
+	<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="317" label="Help" left="80" mouse_opaque="false" name="Help"
+	     opaque="true" tear_off="falsoe" width="166">
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
+		     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
 			<on_click function="ShowFloater" userdata="help f1" />
 		</menu_item_call>
-		<menu_item_call bottom="-48" enabled="true" height="19" hidden="false"
-		     label="About Second Life..." left="0" mouse_opaque="true"
-		     name="About Second Life..." width="166">
+		<menu_item_call bottom="-48" enabled="true" height="19" label="About Second Life..." left="0"
+		     mouse_opaque="true" name="About Second Life..." width="166">
 			<on_click function="ShowFloater" userdata="about" />
 		</menu_item_call>
 	</menu>
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml
index 66e12f0..85028d5 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Attachment Pie">
-	<menu_item_call enabled="false" hidden="false" label="Drop" mouse_opaque="true" name="Drop">
+	<menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
 		<on_click function="Attachment.Drop" />
 		<on_enable function="Attachment.EnableDrop" />
 	</menu_item_call>
@@ -9,11 +9,11 @@
 	<menu_item_separator />
 	<menu_item_separator />
 	<menu_item_separator />
-	<menu_item_call enabled="false" hidden="false" label="Detach" mouse_opaque="true" name="Detach">
+	<menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
 		<on_click function="Attachment.Detach" />
 		<on_enable function="Attachment.EnableDetach" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Edit" mouse_opaque="true" name="Edit">
+	<menu_item_call enabled="false" label="Edit" mouse_opaque="true" name="Edit">
 		<on_click function="Object.Edit" />
 		<on_enable function="EnableEdit" />
 	</menu_item_call>
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
index b2280e2..b224954 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
@@ -1,61 +1,51 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Avatar Pie">
-	<menu_item_call enabled="false" hidden="false" label="Profile..." mouse_opaque="true"
-	     name="Profile...">
+	<menu_item_call enabled="false" label="Profile..." mouse_opaque="true" name="Profile...">
 		<on_click function="ShowAgentProfile" userdata="hit object" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Mute" mouse_opaque="true"
-	     name="Avatar Mute">
+	<menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Avatar Mute">
 		<on_click function="Avatar.Mute" />
 		<on_enable function="Avatar.EnableMute" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Go To" mouse_opaque="true" name="Go To">
+	<menu_item_call enabled="false" label="Go To" mouse_opaque="true" name="Go To">
 		<on_click function="GoToObject" />
 	</menu_item_call>
 	<menu_item_separator />
-	<menu_item_call enabled="false" hidden="false" label="Add Friend" mouse_opaque="true"
-	     name="Add Friend">
+	<menu_item_call enabled="false" label="Add Friend" mouse_opaque="true" name="Add Friend">
 		<on_click function="Avatar.AddFriend" />
 		<on_enable function="Avatar.EnableAddFriend" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Pay..." mouse_opaque="true" name="Pay...">
+	<menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
 		<on_click function="PayObject" />
 		<on_enable function="EnablePayObject" />
 	</menu_item_call>
 	<pie_menu label="More &gt;" name="More &gt;">
-		<menu_item_call enabled="false" hidden="false" label="Freeze..." mouse_opaque="true"
-		     name="Freeze...">
+		<menu_item_call enabled="false" label="Freeze..." mouse_opaque="true" name="Freeze...">
 			<on_click function="Avatar.Freeze" />
 			<on_enable function="Avatar.EnableFreezeEject" />
 		</menu_item_call>
-		<menu_item_call enabled="false" hidden="false" label="Give Card" mouse_opaque="true"
-		     name="Give Card">
+		<menu_item_call enabled="false" label="Give Card" mouse_opaque="true" name="Give Card">
 			<on_click function="Avatar.GiveCard" />
 		</menu_item_call>
-		<menu_item_call enabled="true" hidden="false" label="Group Invite..." mouse_opaque="true"
-			name="Invite...">
+		<menu_item_call enabled="true" label="Group Invite..." mouse_opaque="true" name="Invite...">
 			<on_click function="Avatar.InviteToGroup" />
 		</menu_item_call>
 		<menu_item_separator />
-		<menu_item_call enabled="false" hidden="false" label="Eject..." mouse_opaque="true"
-		     name="Eject...">
+		<menu_item_call enabled="false" label="Eject..." mouse_opaque="true" name="Eject...">
 			<on_click function="Avatar.Eject" />
 			<on_enable function="Avatar.EnableFreezeEject" />
 		</menu_item_call>
-		<menu_item_call enabled="false" hidden="false" label="Debug..." mouse_opaque="true"
-		     name="Debug...">
+		<menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug...">
 			<on_click function="Avatar.Debug" />
 			<on_visible function="Avatar.VisibleDebug" />
 			<on_enable function="Avatar.EnableDebug" />
 		</menu_item_call>
-		<menu_item_call enabled="true" hidden="false" label="Inspect" mouse_opaque="true"
-		     name="Object Inspect">
+		<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
 			<on_click function="Object.Inspect" />
 			<on_enable function="Object.EnableInspect" />
-		</menu_item_call>		
+		</menu_item_call>
 	</pie_menu>
-	<menu_item_call enabled="false" hidden="false" label="Send IM..." mouse_opaque="true"
-	     name="Send IM...">
+	<menu_item_call enabled="false" label="Send IM..." mouse_opaque="true" name="Send IM...">
 		<on_click function="Avatar.SendIM" />
 	</menu_item_call>
 </pie_menu>
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml
index cb06ebf..ee2a431 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml
@@ -1,34 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Land Pie">
-	<menu_item_call enabled="false" hidden="false" label="About Land..." mouse_opaque="true"
-	     name="About Land...">
+	<menu_item_call enabled="false" label="About Land..." mouse_opaque="true" name="About Land...">
 		<on_click function="ShowFloater" userdata="about land" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Create" mouse_opaque="true" name="Create">
+	<menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
 		<on_click function="Land.Build" />
 		<on_enable function="EnableEdit" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Go Here" mouse_opaque="true"
-	     name="Go Here">
+	<menu_item_call enabled="false" label="Go Here" mouse_opaque="true" name="Go Here">
 		<on_click function="GoToObject" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Sit Here" mouse_opaque="true"
-	     name="Sit Here">
+	<menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Sit Here">
 		<on_click function="Land.Sit" />
 	</menu_item_call>
 	<menu_item_separator />
-	<menu_item_call enabled="false" hidden="false" label="Buy Pass..." mouse_opaque="true"
-	     name="Land Buy Pass">
+	<menu_item_call enabled="false" label="Buy Pass..." mouse_opaque="true" name="Land Buy Pass">
 		<on_click function="Land.BuyPass" />
 		<on_enable function="Land.EnableBuyPass" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Edit Terrain" mouse_opaque="true"
-	     name="Edit Terrain">
+	<menu_item_call enabled="false" label="Edit Terrain" mouse_opaque="true" name="Edit Terrain">
 		<on_click function="Land.Edit" />
 		<on_enable function="EnableEdit" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Buy Land..." mouse_opaque="true"
-	     name="Land Buy">
+	<menu_item_call enabled="false" label="Buy Land..." mouse_opaque="true" name="Land Buy">
 		<on_click function="ShowFloater" userdata="buy land" />
 		<on_enable function="World.EnableBuyLand" />
 	</menu_item_call>
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml
index e59ac38..c5a04ce 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml
@@ -1,57 +1,52 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Object Pie">
-	<menu_item_call enabled="false" hidden="false" label="Open" mouse_opaque="true" name="Open">
+	<menu_item_call enabled="false" label="Open" mouse_opaque="true" name="Open">
 		<on_click function="Object.Open" />
 		<on_enable function="Object.EnableOpen" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Create" mouse_opaque="true" name="Create">
+	<menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
 		<on_click function="Object.Build" />
 		<on_enable function="EnableEdit" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Touch" mouse_opaque="true"
-	     name="Object Touch">
+	<menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
 		<on_click function="Object.Touch" />
 		<on_enable function="Object.EnableTouch" userdata="Touch" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Sit Here" mouse_opaque="true"
-	     name="Object Sit">
+	<menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Object Sit">
 		<on_click function="Object.SitOrStand" />
 		<on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Take" mouse_opaque="true"
-	     name="Pie Object Take">
+	<menu_item_call enabled="false" label="Take" mouse_opaque="true" name="Pie Object Take">
 		<on_click function="Tools.BuyOrTake" />
 		<on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
 	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Pay..." mouse_opaque="true" name="Pay...">
+	<menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
 		<on_click function="PayObject" />
 		<on_enable function="EnablePayObject" />
 	</menu_item_call>
 	<pie_menu label="More &gt;" name="More &gt;">
-		<menu_item_call enabled="false" hidden="false" label="Delete" mouse_opaque="true" name="Delete">
+		<menu_item_call enabled="false" label="Delete" mouse_opaque="true" name="Delete">
 			<on_click function="Object.Delete" />
 			<on_enable function="Object.EnableDelete" />
 		</menu_item_call>
-		<menu_item_call enabled="false" hidden="false" label="Wear" mouse_opaque="true" name="Wear">
+		<menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
 			<on_click function="Object.AttachToAvatar" />
 			<on_enable function="Object.EnableWear" />
 		</menu_item_call>
-		<menu_item_call enabled="false" hidden="false" label="Take Copy" mouse_opaque="true"
-		     name="Take Copy">
+		<menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
 			<on_click function="Tools.TakeCopy" />
 			<on_enable function="Tools.EnableTakeCopy" />
 		</menu_item_call>
 		<pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
 		<pie_menu label="Attach &gt;" name="Object Attach" />
-		<menu_item_call enabled="false" hidden="false" label="Return..." mouse_opaque="true"
-		     name="Return...">
+		<menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
 			<on_click function="Object.Return" />
 			<on_enable function="Object.EnableReturn" />
 		</menu_item_call>
 		<pie_menu label="More &gt;" name="Rate Menu">
 			<menu_item_separator />
 			<menu_item_separator />
-			<menu_item_call enabled="false" hidden="false" label="Report Abuse..." mouse_opaque="true"
+			<menu_item_call enabled="false" label="Report Abuse..." mouse_opaque="true"
 			     name="Report Abuse...">
 				<on_click function="Object.ReportAbuse" />
 				<on_enable function="Object.EnableReportAbuse" />
@@ -59,24 +54,21 @@
 			<menu_item_separator />
 			<menu_item_separator />
 			<menu_item_separator />
-			<menu_item_call enabled="false" hidden="false" label="Mute" mouse_opaque="true"
-			     name="Object Mute">
+			<menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
 				<on_click function="Object.Mute" />
 				<on_enable function="Object.EnableMute" />
 			</menu_item_call>
-			<menu_item_call enabled="true" hidden="false" label="Inspect" mouse_opaque="true"
-			     name="Object Inspect">
+			<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
 				<on_click function="Object.Inspect" />
 				<on_enable function="Object.EnableInspect" />
 			</menu_item_call>
 		</pie_menu>
-		<menu_item_call enabled="false" hidden="false" label="Buy..." mouse_opaque="true" name="Buy...">
+		<menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
 			<on_click function="Object.Buy" />
 			<on_enable function="Object.EnableBuy" />
 		</menu_item_call>
 	</pie_menu>
-	<menu_item_call enabled="false" hidden="false" label="Edit..." mouse_opaque="true"
-	     name="Edit...">
+	<menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
 		<on_click function="Object.Edit" />
 		<on_enable function="EnableEdit" />
 	</menu_item_call>
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml
index 82113d4..72fca5e 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml
@@ -21,55 +21,55 @@
 	</menu_item_call>
 	<pie_menu enabled="true" label="Take Off &gt;" name="Take Off &gt;">
 		<pie_menu enabled="true" label="Clothes &gt;" name="Clothes &gt;">
-			<menu_item_call bottom="-29" enabled="false" height="19" hidden="false" label="Shirt" left="0"
+			<menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
 			     mouse_opaque="true" name="Shirt" width="118">
 				<on_click function="Edit.TakeOff" userdata="shirt" />
 				<on_enable function="Edit.EnableTakeOff" userdata="shirt" />
 			</menu_item_call>
-			<menu_item_call bottom="-48" enabled="false" height="19" hidden="false" label="Pants" left="0"
+			<menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0"
 			     mouse_opaque="true" name="Pants" width="118">
 				<on_click function="Edit.TakeOff" userdata="pants" />
 				<on_enable function="Edit.EnableTakeOff" userdata="pants" />
 			</menu_item_call>
-			<menu_item_call bottom="-67" enabled="false" height="19" hidden="false" label="Shoes" left="0"
+			<menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0"
 			     mouse_opaque="true" name="Shoes" width="118">
 				<on_click function="Edit.TakeOff" userdata="shoes" />
 				<on_enable function="Edit.EnableTakeOff" userdata="shoes" />
 			</menu_item_call>
-			<menu_item_call bottom="-86" enabled="false" height="19" hidden="false" label="Socks" left="0"
+			<menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0"
 			     mouse_opaque="true" name="Socks" width="118">
 				<on_click function="Edit.TakeOff" userdata="socks" />
 				<on_enable function="Edit.EnableTakeOff" userdata="socks" />
 			</menu_item_call>
-			<menu_item_call bottom="-105" enabled="false" height="19" hidden="false" label="Jacket"
-			     left="0" mouse_opaque="true" name="Jacket" width="118">
+			<menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0"
+			     mouse_opaque="true" name="Jacket" width="118">
 				<on_click function="Edit.TakeOff" userdata="jacket" />
 				<on_enable function="Edit.EnableTakeOff" userdata="jacket" />
 			</menu_item_call>
-			<menu_item_call bottom="-124" enabled="false" height="19" hidden="false" label="Gloves"
-			     left="0" mouse_opaque="true" name="Gloves" width="118">
+			<menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0"
+			     mouse_opaque="true" name="Gloves" width="118">
 				<on_click function="Edit.TakeOff" userdata="gloves" />
 				<on_enable function="Edit.EnableTakeOff" userdata="gloves" />
 			</menu_item_call>
 			<pie_menu enabled="true" label="More &gt;" name="More &gt;">
-				<menu_item_call bottom="-143" enabled="false" height="19" hidden="false" label="Undershirt"
-				     left="0" mouse_opaque="true" name="Self Undershirt" width="118">
+				<menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0"
+				     mouse_opaque="true" name="Self Undershirt" width="118">
 					<on_click function="Edit.TakeOff" userdata="undershirt" />
 					<on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
 				</menu_item_call>
 				<menu_item_separator />
-				<menu_item_call bottom="-200" enabled="true" height="19" hidden="false" label="All Clothes"
-				     left="0" mouse_opaque="true" name="All Clothes" width="118">
+				<menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0"
+				     mouse_opaque="true" name="All Clothes" width="118">
 					<on_click function="Edit.TakeOff" userdata="all" />
 				</menu_item_call>
 				<menu_item_separator />
-				<menu_item_call bottom="-162" enabled="false" height="19" hidden="false" label="Underpants"
-				     left="0" mouse_opaque="true" name="Self Underpants" width="118">
+				<menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
+				     mouse_opaque="true" name="Self Underpants" width="118">
 					<on_click function="Edit.TakeOff" userdata="underpants" />
 					<on_enable function="Edit.EnableTakeOff" userdata="underpants" />
 				</menu_item_call>
 			</pie_menu>
-			<menu_item_call bottom="-181" enabled="false" height="19" hidden="false" label="Skirt" left="0"
+			<menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0"
 			     mouse_opaque="true" name="Skirt" width="118">
 				<on_click function="Edit.TakeOff" userdata="skirt" />
 				<on_enable function="Edit.EnableTakeOff" userdata="skirt" />
diff --git a/linden/indra/newview/skins/xui/en-us/menu_slurl.xml b/linden/indra/newview/skins/xui/en-us/menu_slurl.xml
index 0682334..6852a70 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_slurl.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_slurl.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu bottom="100" color="0, 0, 0, 1" drop_shadow="true" height="101" hidden="false"
-     left="100" mouse_opaque="false" name="Popup" opaque="true" width="128">
+<menu bottom="100" color="0, 0, 0, 1" drop_shadow="true" height="101" left="100"
+     mouse_opaque="false" name="Popup" opaque="true" width="128">
 	<menu_item_separator name="Landmark Separator" />
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="About URL"
-	     left="0" mouse_opaque="true" name="about_url" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="About URL" left="0" mouse_opaque="true"
+	     name="about_url" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="about" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Teleport to URL"
-	     left="0" mouse_opaque="true" name="teleport_to_url" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Teleport to URL" left="0"
+	     mouse_opaque="true" name="teleport_to_url" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="about" />
 	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" hidden="false" label="Show on Map"
-	     left="0" mouse_opaque="true" name="show_on_map" width="128">
+	<menu_item_call bottom_delta="-18" height="18" label="Show on Map" left="0" mouse_opaque="true"
+	     name="show_on_map" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="about" />
 	</menu_item_call>
 </menu>
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index 1fa57da..2d07c98 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -1,929 +1,890 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" drop_shadow="false" enabled="true"
-     follows="left|top|right" height="18" hidden="false" left="0"
-     mouse_opaque="true" name="Main Menu" opaque="true" tear_off="false"
-     width="802">
-	<menu bottom="273" drop_shadow="true" enabled="true" height="263"
-	     hidden="false" label="File" left="0" mouse_opaque="false" name="File"
-	     opaque="true" tear_off="true" create_jump_keys="true" width="243">
-		<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
-		     left="0" mouse_opaque="true" name="~~~~~~~~~~~" width="243" />
-		<menu_item_call bottom="-29" enabled="true" height="19" hidden="false"
-		     label="Upload Image (L$[COST])..." left="0" mouse_opaque="true"
-		     name="Upload Image" shortcut="control|U" width="243">
+<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+     height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="true"
+     tear_off="false" width="802">
+	<menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="263" label="File" left="0" mouse_opaque="false" name="File"
+	     opaque="true" tear_off="true" width="243">
+		<tearoff_menu bottom="-10" enabled="true" height="10" label="~~~~~~~~~~~" left="0"
+		     mouse_opaque="true" name="~~~~~~~~~~~" width="243" />
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Upload Image (L$[COST])..."
+		     left="0" mouse_opaque="true" name="Upload Image" shortcut="control|U"
+		     width="243">
 			<on_click function="File.UploadImage" userdata="" />
 			<on_enable function="File.EnableUpload" />
 		</menu_item_call>
-		<menu_item_call bottom="-48" enabled="true" height="19" hidden="false"
-		     label="Upload Sound (L$[COST])..." left="0" mouse_opaque="true"
-		     name="Upload Sound" width="243">
+		<menu_item_call bottom="-48" enabled="true" height="19" label="Upload Sound (L$[COST])..."
+		     left="0" mouse_opaque="true" name="Upload Sound" width="243">
 			<on_click function="File.UploadSound" userdata="" />
 			<on_enable function="File.EnableUpload" />
 		</menu_item_call>
-		<menu_item_call bottom="-67" enabled="true" height="19" hidden="false"
-		     label="Upload Animation (L$[COST])..." left="0" mouse_opaque="true"
-		     name="Upload Animation" width="243">
+		<menu_item_call bottom="-67" enabled="true" height="19" label="Upload Animation (L$[COST])..."
+		     left="0" mouse_opaque="true" name="Upload Animation" width="243">
 			<on_click function="File.UploadAnim" userdata="" />
 			<on_enable function="File.EnableUpload" />
 		</menu_item_call>
-		<menu_item_call bottom="-86" enabled="true" height="19" hidden="false"
+		<menu_item_call bottom="-86" enabled="true" height="19"
 		     label="Bulk Upload (L$[COST] per file)..." left="0" mouse_opaque="true"
 		     name="Bulk Upload" width="243">
 			<on_click function="File.UploadBulk" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-94" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator" width="243" />
-		<menu_item_call bottom="-113" enabled="true" height="19" hidden="false" label="Close Window"
-		     left="0" mouse_opaque="true" name="Close Window" shortcut="control|W"
-		     width="243">
+		<menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator" width="243" />
+		<menu_item_call bottom="-113" enabled="true" height="19" label="Close Window" left="0"
+		     mouse_opaque="true" name="Close Window" shortcut="control|W" width="243">
 			<on_click function="File.CloseWindow" userdata="" />
 			<on_enable function="File.EnableCloseWindow" userdata="" />
 		</menu_item_call>
-		<menu_item_call bottom="-113" enabled="true" height="19" hidden="false" label="Close All Windows"
-		     left="0" mouse_opaque="true" name="Close All Windows" shortcut="control|shift|W"
+		<menu_item_call bottom="-113" enabled="true" height="19" label="Close All Windows" left="0"
+		     mouse_opaque="true" name="Close All Windows" shortcut="control|shift|W"
 		     width="243">
 			<on_click function="File.CloseAllWindows" userdata="" />
 			<on_enable function="File.EnableCloseAllWindows" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-121" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator2" width="243" />
-		<menu_item_call bottom="-140" enabled="true" height="19" hidden="false"
-		     label="Save Texture As..." left="0" mouse_opaque="true"
-		     name="Save Texture As..." width="243">
+		<menu_item_separator bottom="-121" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator2" width="243" />
+		<menu_item_call bottom="-140" enabled="true" height="19" label="Save Texture As..." left="0"
+		     mouse_opaque="true" name="Save Texture As..." width="243">
 			<on_click function="File.SaveTexture" userdata="" />
 			<on_enable function="File.EnableSaveAs" />
 		</menu_item_call>
-		<menu_item_separator bottom="-148" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator3" width="243" />
-		<menu_item_call bottom="-167" enabled="true" height="19" hidden="false" label="Take Snapshot"
-		     left="0" mouse_opaque="true" name="Take Snapshot"
-		     shortcut="control|shift|S" width="243">
+		<menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator3" width="243" />
+		<menu_item_call bottom="-167" enabled="true" height="19" label="Take Snapshot" left="0"
+		     mouse_opaque="true" name="Take Snapshot" shortcut="control|shift|S"
+		     width="243">
 			<on_click function="File.TakeSnapshot" userdata="" />
 		</menu_item_call>
-		<menu_item_call bottom="-186" enabled="true" height="19" hidden="false"
-		     label="Snapshot to Disk" left="0" mouse_opaque="true"
-		     name="Snapshot to Disk" shortcut="control|`" useMacCtrl="true" width="243">
+		<menu_item_call bottom="-186" enabled="true" height="19" label="Snapshot to Disk" left="0"
+		     mouse_opaque="true" name="Snapshot to Disk" shortcut="control|`"
+		     useMacCtrl="true" width="243">
 			<on_click function="File.TakeSnapshotToDisk" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-194" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator4" width="243" />
-		<menu_item_call bottom="-213" enabled="true" height="19" hidden="false"
-		     label="Start/Stop Movie to Disk" left="0" mouse_opaque="true"
-		     name="Start/Stop Movie to Disk" shortcut="control|shift|A" width="243">
+		<menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator4" width="243" />
+		<menu_item_call bottom="-213" enabled="true" height="19" label="Start/Stop Movie to Disk"
+		     left="0" mouse_opaque="true" name="Start/Stop Movie to Disk"
+		     shortcut="control|shift|A" width="243">
 			<on_click function="File.SaveMovie" userdata="" />
 		</menu_item_call>
-		<menu bottom="-554" drop_shadow="true" enabled="true" height="117"
-		     hidden="false" label="Set Window Size" left="0" mouse_opaque="false"
-		     name="Set Window Size" opaque="true" tear_off="true" create_jump_keys="true" width="125">
-			<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="320x240" left="0"
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="117" label="Set Window Size" left="0" mouse_opaque="false"
+		     name="Set Window Size" opaque="true" tear_off="true" width="125">
+			<menu_item_call bottom="-29" enabled="true" height="19" label="320x240" left="0"
 			     mouse_opaque="true" name="320x240" width="125">
 				<on_click function="File.SetWindowSize" userdata="320,240" />
 			</menu_item_call>
-			<menu_item_call bottom="-48" enabled="true" height="19" hidden="false" label="640x480" left="0"
+			<menu_item_call bottom="-48" enabled="true" height="19" label="640x480" left="0"
 			     mouse_opaque="true" name="640x480" width="125">
 				<on_click function="File.SetWindowSize" userdata="640,480" />
 			</menu_item_call>
-			<menu_item_call bottom="-67" enabled="true" height="19" hidden="false" label="800x600" left="0"
+			<menu_item_call bottom="-67" enabled="true" height="19" label="800x600" left="0"
 			     mouse_opaque="true" name="800x600" width="125">
 				<on_click function="File.SetWindowSize" userdata="800,600" />
 			</menu_item_call>
-			<menu_item_separator bottom="-75" enabled="true" height="8" hidden="false" label="-----------"
-			     left="0" mouse_opaque="true" name="separator" width="125" />
-			<menu_item_call bottom="-94" enabled="true" height="19" hidden="false" label="720x480 (NTSC)"
-			     left="0" mouse_opaque="true" name="720x480 (NTSC)" width="125">
+			<menu_item_separator bottom="-75" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator" width="125" />
+			<menu_item_call bottom="-94" enabled="true" height="19" label="720x480 (NTSC)" left="0"
+			     mouse_opaque="true" name="720x480 (NTSC)" width="125">
 				<on_click function="File.SetWindowSize" userdata="720,480" />
 			</menu_item_call>
-			<menu_item_call bottom="-113" enabled="true" height="19" hidden="false" label="768x576 (PAL)"
-			     left="0" mouse_opaque="true" name="768x576 (PAL)" width="125">
+			<menu_item_call bottom="-113" enabled="true" height="19" label="768x576 (PAL)" left="0"
+			     mouse_opaque="true" name="768x576 (PAL)" width="125">
 				<on_click function="File.SetWindowSize" userdata="768,576" />
 			</menu_item_call>
 		</menu>
-		<menu_item_separator bottom="-240" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator5" width="243" />
-		<menu_item_call bottom="-259" enabled="true" height="19" hidden="false" label="Quit" left="0"
+		<menu_item_separator bottom="-240" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator5" width="243" />
+		<menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0"
 		     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
 			<on_click function="File.Quit" userdata="" />
 		</menu_item_call>
 	</menu>
-	<menu bottom="97" drop_shadow="true" enabled="true" height="439"
-	     hidden="false" label="Edit" left="38" mouse_opaque="false" name="Edit"
-	     opaque="true" tear_off="true" create_jump_keys="true" width="153">
-		<menu_item_call bottom="-29" enabled="false" height="19" hidden="false" label="Undo" left="0"
+	<menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
+	     opaque="true" tear_off="true" width="153">
+		<menu_item_call bottom="-29" enabled="false" height="19" label="Undo" left="0"
 		     mouse_opaque="true" name="Undo" shortcut="control|Z" width="153">
 			<on_click function="Edit.Undo" userdata="" />
 			<on_enable function="Edit.EnableUndo" />
 		</menu_item_call>
-		<menu_item_call bottom="-48" enabled="false" height="19" hidden="false" label="Redo" left="0"
+		<menu_item_call bottom="-48" enabled="false" height="19" label="Redo" left="0"
 		     mouse_opaque="true" name="Redo" shortcut="control|Y" width="153">
 			<on_click function="Edit.Redo" userdata="" />
 			<on_enable function="Edit.EnableRedo" />
 		</menu_item_call>
-		<menu_item_separator bottom="-56" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator" width="153" />
-		<menu_item_call bottom="-75" enabled="false" height="19" hidden="false" label="Cut" left="0"
+		<menu_item_separator bottom="-56" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator" width="153" />
+		<menu_item_call bottom="-75" enabled="false" height="19" label="Cut" left="0"
 		     mouse_opaque="true" name="Cut" shortcut="control|X" width="153">
 			<on_click function="Edit.Cut" userdata="" />
 			<on_enable function="Edit.EnableCut" />
 		</menu_item_call>
-		<menu_item_call bottom="-94" enabled="false" height="19" hidden="false" label="Copy" left="0"
+		<menu_item_call bottom="-94" enabled="false" height="19" label="Copy" left="0"
 		     mouse_opaque="true" name="Copy" shortcut="control|C" width="153">
 			<on_click function="Edit.Copy" userdata="" />
 			<on_enable function="Edit.EnableCopy" />
 		</menu_item_call>
-		<menu_item_call bottom="-113" enabled="false" height="19" hidden="false" label="Paste" left="0"
+		<menu_item_call bottom="-113" enabled="false" height="19" label="Paste" left="0"
 		     mouse_opaque="true" name="Paste" shortcut="control|V" width="153">
 			<on_click function="Edit.Paste" userdata="" />
 			<on_enable function="Edit.EnablePaste" />
 		</menu_item_call>
-		<menu_item_call bottom="-132" enabled="false" height="19" hidden="false" label="Delete"
-		     left="0" mouse_opaque="true" name="Delete" shortcut="Del" width="153">
+		<menu_item_call bottom="-132" enabled="false" height="19" label="Delete" left="0"
+		     mouse_opaque="true" name="Delete" shortcut="Del" width="153">
 			<on_click function="Edit.Delete" userdata="" />
 			<on_enable function="Edit.EnableDelete" />
 		</menu_item_call>
-		<menu_item_separator bottom="-140" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator2" width="153" />
-		<menu_item_call bottom="-159" enabled="true" height="19" hidden="false" label="Search..."
-		     left="0" mouse_opaque="true" name="Search..." shortcut="control|F"
-		     width="153">
+		<menu_item_separator bottom="-140" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator2" width="153" />
+		<menu_item_call bottom="-159" enabled="true" height="19" label="Search..." left="0"
+		     mouse_opaque="true" name="Search..." shortcut="control|F" width="153">
 			<on_click function="Edit.Search" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-167" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator3" width="153" />
-		<menu_item_call bottom="-186" enabled="false" height="19" hidden="false" label="Select All"
-		     left="0" mouse_opaque="true" name="Select All" shortcut="control|A"
-		     width="153">
+		<menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator3" width="153" />
+		<menu_item_call bottom="-186" enabled="false" height="19" label="Select All" left="0"
+		     mouse_opaque="true" name="Select All" shortcut="control|A" width="153">
 			<on_click function="Edit.SelectAll" userdata="" />
 			<on_enable function="Edit.EnableSelectAll" />
 		</menu_item_call>
-		<menu_item_call bottom="-205" enabled="false" height="19" hidden="false" label="Deselect"
-		     left="0" mouse_opaque="true" name="Deselect" shortcut="control|E"
-		     width="153">
+		<menu_item_call bottom="-205" enabled="false" height="19" label="Deselect" left="0"
+		     mouse_opaque="true" name="Deselect" shortcut="control|E" width="153">
 			<on_click function="Edit.Deselect" userdata="" />
 			<on_enable function="Edit.EnableDeselect" />
 		</menu_item_call>
-		<menu_item_separator bottom="-213" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator4" width="153" />
-		<menu_item_call bottom="-232" enabled="false" height="19" hidden="false" label="Duplicate"
-		     left="0" mouse_opaque="true" name="Duplicate" shortcut="control|D"
-		     width="153">
+		<menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator4" width="153" />
+		<menu_item_call bottom="-232" enabled="false" height="19" label="Duplicate" left="0"
+		     mouse_opaque="true" name="Duplicate" shortcut="control|D" width="153">
 			<on_click function="Edit.Duplicate" userdata="" />
 			<on_enable function="Edit.EnableDuplicate" />
 		</menu_item_call>
-		<menu_item_separator bottom="-240" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator5" width="153" />
-		<menu bottom="-554" drop_shadow="true" enabled="true" height="554"
-		     hidden="false" label="Attach Object" left="0" mouse_opaque="false"
-		     name="Attach Object" opaque="true" tear_off="true" create_jump_keys="true"
-		     width="117" />
-		<menu bottom="-554" drop_shadow="true" enabled="true" height="554"
-		     hidden="false" label="Detach Object" left="191" mouse_opaque="false"
-		     name="Detach Object" opaque="true" tear_off="true" create_jump_keys="true"
-		     width="118" />
-		<menu bottom="-554" drop_shadow="true" enabled="true" height="204"
-		     hidden="false" label="Take Off Clothing" left="0" mouse_opaque="false"
-		     name="Take Off Clothing" opaque="true" tear_off="true" create_jump_keys="true"
-		     width="118">
-			<menu_item_call bottom="-29" enabled="false" height="19" hidden="false" label="Shirt" left="0"
+		<menu_item_separator bottom="-240" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator5" width="153" />
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="554" label="Attach Object" left="0" mouse_opaque="false"
+		     name="Attach Object" opaque="true" tear_off="true" width="117" />
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="554" label="Detach Object" left="191" mouse_opaque="false"
+		     name="Detach Object" opaque="true" tear_off="true" width="118" />
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="204" label="Take Off Clothing" left="0" mouse_opaque="false"
+		     name="Take Off Clothing" opaque="true" tear_off="true" width="118">
+			<menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
 			     mouse_opaque="true" name="Shirt" width="118">
 				<on_click function="Edit.TakeOff" userdata="shirt" />
 				<on_enable function="Edit.EnableTakeOff" userdata="shirt" />
 			</menu_item_call>
-			<menu_item_call bottom="-48" enabled="false" height="19" hidden="false" label="Pants" left="0"
+			<menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0"
 			     mouse_opaque="true" name="Pants" width="118">
 				<on_click function="Edit.TakeOff" userdata="pants" />
 				<on_enable function="Edit.EnableTakeOff" userdata="pants" />
 			</menu_item_call>
-			<menu_item_call bottom="-67" enabled="false" height="19" hidden="false" label="Shoes" left="0"
+			<menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0"
 			     mouse_opaque="true" name="Shoes" width="118">
 				<on_click function="Edit.TakeOff" userdata="shoes" />
 				<on_enable function="Edit.EnableTakeOff" userdata="shoes" />
 			</menu_item_call>
-			<menu_item_call bottom="-86" enabled="false" height="19" hidden="false" label="Socks" left="0"
+			<menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0"
 			     mouse_opaque="true" name="Socks" width="118">
 				<on_click function="Edit.TakeOff" userdata="socks" />
 				<on_enable function="Edit.EnableTakeOff" userdata="socks" />
 			</menu_item_call>
-			<menu_item_call bottom="-105" enabled="false" height="19" hidden="false" label="Jacket"
-			     left="0" mouse_opaque="true" name="Jacket" width="118">
+			<menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0"
+			     mouse_opaque="true" name="Jacket" width="118">
 				<on_click function="Edit.TakeOff" userdata="jacket" />
 				<on_enable function="Edit.EnableTakeOff" userdata="jacket" />
 			</menu_item_call>
-			<menu_item_call bottom="-124" enabled="false" height="19" hidden="false" label="Gloves"
-			     left="0" mouse_opaque="true" name="Gloves" width="118">
+			<menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0"
+			     mouse_opaque="true" name="Gloves" width="118">
 				<on_click function="Edit.TakeOff" userdata="gloves" />
 				<on_enable function="Edit.EnableTakeOff" userdata="gloves" />
 			</menu_item_call>
-			<menu_item_call bottom="-143" enabled="false" height="19" hidden="false" label="Undershirt"
-			     left="0" mouse_opaque="true" name="Menu Undershirt" width="118">
+			<menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0"
+			     mouse_opaque="true" name="Menu Undershirt" width="118">
 				<on_click function="Edit.TakeOff" userdata="undershirt" />
 				<on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
 			</menu_item_call>
-			<menu_item_call bottom="-162" enabled="false" height="19" hidden="false" label="Underpants"
-			     left="0" mouse_opaque="true" name="Menu Underpants" width="118">
+			<menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
+			     mouse_opaque="true" name="Menu Underpants" width="118">
 				<on_click function="Edit.TakeOff" userdata="underpants" />
 				<on_enable function="Edit.EnableTakeOff" userdata="underpants" />
 			</menu_item_call>
-			<menu_item_call bottom="-181" enabled="false" height="19" hidden="false" label="Skirt" left="0"
+			<menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0"
 			     mouse_opaque="true" name="Skirt" width="118">
 				<on_click function="Edit.TakeOff" userdata="skirt" />
 				<on_enable function="Edit.EnableTakeOff" userdata="skirt" />
 			</menu_item_call>
-			<menu_item_call bottom="-200" enabled="true" height="19" hidden="false" label="All Clothes"
-			     left="0" mouse_opaque="true" name="All Clothes" width="118">
+			<menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0"
+			     mouse_opaque="true" name="All Clothes" width="118">
 				<on_click function="Edit.TakeOff" userdata="all" />
 			</menu_item_call>
 		</menu>
-		<menu_item_separator bottom="-305" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator6" width="153" />
-		<menu_item_call bottom="-324" enabled="true" height="19" hidden="false" label="Gestures..."
-		     left="0" mouse_opaque="true" name="Gestures..." shortcut="control|G"
-		     width="153">
+		<menu_item_separator bottom="-305" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator6" width="153" />
+		<menu_item_call bottom="-324" enabled="true" height="19" label="Gestures..." left="0"
+		     mouse_opaque="true" name="Gestures..." shortcut="control|G" width="153">
 			<on_click function="ShowFloater" userdata="gestures" />
 		</menu_item_call>
-		<menu_item_call bottom="-343" enabled="true" height="19" hidden="false" label="Profile..."
-		     left="0" mouse_opaque="true" name="Profile..." width="153">
+		<menu_item_call bottom="-343" enabled="true" height="19" label="Profile..." left="0"
+		     mouse_opaque="true" name="Profile..." width="153">
 			<on_click function="ShowAgentProfile" userdata="agent" />
 		</menu_item_call>
-		<menu_item_call bottom="-362" enabled="true" height="19" hidden="false" label="Appearance..."
-		     left="0" mouse_opaque="true" name="Appearance..." width="153">
+		<menu_item_call bottom="-362" enabled="true" height="19" label="Appearance..." left="0"
+		     mouse_opaque="true" name="Appearance..." width="153">
 			<on_click function="ShowFloater" userdata="appearance" />
 			<on_enable function="Edit.EnableCustomizeAvatar" />
 		</menu_item_call>
-		<menu_item_separator bottom="-370" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator7" width="153" />
-		<menu_item_check bottom="-389" enabled="true" height="19" hidden="false" label="Friends..."
-		     left="0" mouse_opaque="true" name="Friends..." shortcut="control|shift|F"
+		<menu_item_separator bottom="-370" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator7" width="153" />
+		<menu_item_check bottom="-389" enabled="true" height="19" label="Friends..." left="0"
+		     mouse_opaque="true" name="Friends..." shortcut="control|shift|F"
 		     width="153">
 			<on_click function="ShowFloater" userdata="friends" />
 			<on_check function="FloaterVisible" userdata="friends" />
 		</menu_item_check>
-		<menu_item_call bottom="-408" enabled="true" height="19" hidden="false" label="Groups..."
-		     left="0" mouse_opaque="true" name="Groups..." width="153">
+		<menu_item_call bottom="-408" enabled="true" height="19" label="Groups..." left="0"
+		     mouse_opaque="true" name="Groups..." width="153">
 			<on_click function="ShowAgentGroups" userdata="agent" />
 		</menu_item_call>
-		<menu_item_separator bottom="-416" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator8" width="153" />
-		<menu_item_call bottom="-435" enabled="true" height="19" hidden="false" label="Preferences..."
-		     left="0" mouse_opaque="true" name="Preferences..." shortcut="control|P"
-		     width="153">
+		<menu_item_separator bottom="-416" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator8" width="153" />
+		<menu_item_call bottom="-435" enabled="true" height="19" label="Preferences..." left="0"
+		     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
 			<on_click function="ShowFloater" userdata="preferences" />
 		</menu_item_call>
 	</menu>
-	<menu bottom="-1" drop_shadow="true" enabled="true" height="537"
-	     hidden="false" label="View" left="80" mouse_opaque="false" name="View"
-	     opaque="true" tear_off="true" create_jump_keys="true" width="211">
-		<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
-		     left="0" mouse_opaque="true" name="~~~~~~~~~~~" width="211" />
-		<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Mouselook"
-		     left="0" mouse_opaque="true" name="Mouselook" shortcut="M" width="211">
+	<menu bottom="-1" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="537" label="View" left="80" mouse_opaque="false" name="View"
+	     opaque="true" tear_off="true" width="211">
+		<tearoff_menu bottom="-10" enabled="true" height="10" label="~~~~~~~~~~~" left="0"
+		     mouse_opaque="true" name="~~~~~~~~~~~" width="211" />
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Mouselook" left="0"
+		     mouse_opaque="true" name="Mouselook" shortcut="M" width="211">
 			<on_click function="View.Mouselook" userdata="" />
 			<on_enable function="View.EnableMouselook" />
 		</menu_item_call>
-		<menu_item_check bottom="-48" enabled="true" height="19" hidden="false" label="Build" left="0"
+		<menu_item_check bottom="-48" enabled="true" height="19" label="Build" left="0"
 		     mouse_opaque="true" name="Build" shortcut="B" width="211">
 			<on_click function="View.BuildMode" userdata="" />
 			<on_check function="View.CheckBuildMode" />
 		</menu_item_check>
-		<menu_item_call bottom="-67" enabled="true" height="19" hidden="false" label="Reset View"
-		     left="0" mouse_opaque="true" name="Reset View" shortcut="Esc" width="211">
+		<menu_item_call bottom="-67" enabled="true" height="19" label="Reset View" left="0"
+		     mouse_opaque="true" name="Reset View" shortcut="Esc" width="211">
 			<on_click function="View.ResetView" userdata="" />
 		</menu_item_call>
-		<menu_item_call bottom="-86" enabled="false" height="19" hidden="false"
-		     label="Look at Last Chatter" left="0" mouse_opaque="true"
-		     name="Look at Last Chatter" shortcut="control|\" width="211">
+		<menu_item_call bottom="-86" enabled="false" height="19" label="Look at Last Chatter" left="0"
+		     mouse_opaque="true" name="Look at Last Chatter" shortcut="control|\"
+		     width="211">
 			<on_click function="View.LookAtLastChatter" userdata="" />
 			<on_enable function="View.EnableLastChatter" />
 		</menu_item_call>
-		<menu_item_separator bottom="-94" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator" width="211" />
-		<menu_item_check bottom="-113" enabled="true" height="19" hidden="false" label="Toolbar"
-		     left="0" mouse_opaque="true" name="Toolbar" width="211">
+		<menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator" width="211" />
+		<menu_item_check bottom="-113" enabled="true" height="19" label="Toolbar" left="0"
+		     mouse_opaque="true" name="Toolbar" width="211">
 			<on_click function="ShowFloater" userdata="toolbar" />
 			<on_check function="FloaterVisible" userdata="toolbar" />
 		</menu_item_check>
-		<menu_item_check bottom="-132" enabled="true" height="19" hidden="false" label="Chat History"
-		     left="0" mouse_opaque="true" name="Chat History" shortcut="control|H"
-		     width="211">
+		<menu_item_check bottom="-132" enabled="true" height="19" label="Local Chat" left="0"
+		     mouse_opaque="true" name="Chat History" shortcut="control|H" width="211">
 			<on_click function="ShowFloater" userdata="chat history" />
 			<on_check function="FloaterVisible" userdata="chat history" />
 		</menu_item_check>
-		<menu_item_check bottom="-151" enabled="true" height="19" hidden="false" label="Instant Message"
-		     left="0" mouse_opaque="true" name="Instant Message" shortcut="control|T"
-		     width="211">
+		<menu_item_check bottom="-151" enabled="true" height="19" label="Communicate" left="0"
+		     mouse_opaque="true" name="Instant Message" shortcut="control|T" width="211">
 			<on_click function="ShowFloater" userdata="im" />
 			<on_check function="FloaterVisible" userdata="im" />
 		</menu_item_check>
-		<menu_item_call bottom="-170" enabled="true" height="19" hidden="false" label="Inventory"
-		     left="0" mouse_opaque="true" name="Inventory" shortcut="control|I"
-		     width="211">
+		<menu_item_call bottom="-170" enabled="true" height="19" label="Inventory" left="0"
+		     mouse_opaque="true" name="Inventory" shortcut="control|I" width="211">
 			<on_click function="ShowFloater" userdata="inventory" />
 		</menu_item_call>
-		<menu_item_check bottom="-189" enabled="true" height="19" hidden="false" label="Active Speakers"
-		     left="0" mouse_opaque="true" name="Active Speakers" width="211">
+		<menu_item_check bottom="-189" enabled="true" height="19" label="Active Speakers" left="0"
+		     mouse_opaque="true" name="Active Speakers" width="211">
 			<on_click function="ShowFloater" userdata="active speakers" />
 			<on_check function="FloaterVisible" userdata="active speakers" />
 		</menu_item_check>
-		<menu_item_check bottom="-189" enabled="true" height="19" hidden="false" label="Mute List"
-		     left="0" mouse_opaque="true" name="Mute List" width="211">
+		<menu_item_check bottom="-189" enabled="true" height="19" label="Mute List" left="0"
+		     mouse_opaque="true" name="Mute List" width="211">
 			<on_click function="ShowFloater" userdata="mute list" />
 			<on_check function="FloaterVisible" userdata="mute list" />
 		</menu_item_check>
-		<menu_item_separator bottom="-197" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator2" width="211" />
-		<menu_item_check bottom="-216" enabled="true" height="19" hidden="false" label="Camera Controls"
-		     left="0" mouse_opaque="true" name="Camera Controls" width="211">
+		<menu_item_separator bottom="-197" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator2" width="211" />
+		<menu_item_check bottom="-216" enabled="true" height="19" label="Camera Controls" left="0"
+		     mouse_opaque="true" name="Camera Controls" width="211">
 			<on_click function="ShowFloater" userdata="camera controls" />
 			<on_check function="FloaterVisible" userdata="camera controls" />
 		</menu_item_check>
-		<menu_item_check bottom="-235" enabled="true" height="19" hidden="false"
-		     label="Movement Controls" left="0" mouse_opaque="true"
-		     name="Movement Controls" width="211">
+		<menu_item_check bottom="-235" enabled="true" height="19" label="Movement Controls" left="0"
+		     mouse_opaque="true" name="Movement Controls" width="211">
 			<on_click function="ShowFloater" userdata="movement controls" />
 			<on_check function="FloaterVisible" userdata="movement controls" />
 		</menu_item_check>
-		<menu_item_check bottom="-254" enabled="true" height="19" hidden="false" label="World Map"
-		     left="0" mouse_opaque="true" name="World Map" shortcut="control|M"
-		     width="211">
+		<menu_item_check bottom="-254" enabled="true" height="19" label="World Map" left="0"
+		     mouse_opaque="true" name="World Map" shortcut="control|M" width="211">
 			<on_click function="ShowFloater" userdata="world map" />
 			<on_check control="ShowWorldMap" />
 		</menu_item_check>
-		<menu_item_check bottom="-273" enabled="true" height="19" hidden="false" label="Mini-Map"
-		     left="0" mouse_opaque="true" name="Mini-Map" shortcut="control|shift|M"
-		     width="211">
+		<menu_item_check bottom="-273" enabled="true" height="19" label="Mini-Map" left="0"
+		     mouse_opaque="true" name="Mini-Map" shortcut="control|shift|M" width="211">
 			<on_click function="ShowFloater" userdata="mini map" />
 			<on_check control="ShowMiniMap" />
 		</menu_item_check>
-		<menu_item_separator bottom="-281" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator3" width="211" />
-		<menu_item_check bottom="-300" enabled="true" height="19" hidden="false" label="Statistics Bar"
-		     left="0" mouse_opaque="true" name="Statistics Bar"
-		     shortcut="control|shift|1" width="211">
+		<menu_item_separator bottom="-281" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator3" width="211" />
+		<menu_item_check bottom="-300" enabled="true" height="19" label="Statistics Bar" left="0"
+		     mouse_opaque="true" name="Statistics Bar" shortcut="control|shift|1"
+		     width="211">
 			<on_click function="ShowFloater" userdata="stat bar" />
 			<on_check function="FloaterVisible" userdata="stat bar" />
 		</menu_item_check>
-		<menu_item_check bottom="-319" enabled="true" height="19" hidden="false" label="Property Lines"
-		     left="0" mouse_opaque="true" name="Property Lines"
-		     shortcut="control|alt|shift|P" width="211">
+		<menu_item_check bottom="-319" enabled="true" height="19" label="Property Lines" left="0"
+		     mouse_opaque="true" name="Property Lines" shortcut="control|alt|shift|P"
+		     width="211">
 			<on_click function="ToggleControl" userdata="ShowPropertyLines" />
 			<on_check control="ShowPropertyLines" />
 		</menu_item_check>
-		<menu_item_check bottom="-338" enabled="true" height="19" hidden="false" label="Land Owners"
-		     left="0" mouse_opaque="true" name="Land Owners" width="211">
+		<menu_item_check bottom="-338" enabled="true" height="19" label="Land Owners" left="0"
+		     mouse_opaque="true" name="Land Owners" width="211">
 			<on_click function="ToggleControl" userdata="ShowParcelOwners" />
 			<on_check control="ShowParcelOwners" />
 		</menu_item_check>
-		<menu_item_separator bottom="-346" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator4" width="211" />
-		<menu bottom="-554" drop_shadow="true" enabled="true" height="79"
-		     hidden="false" label="Hover Tips" left="0" mouse_opaque="false"
-		     name="Hover Tips" opaque="true" tear_off="true" create_jump_keys="true"
-		     width="158">
-			<menu_item_check bottom="-29" enabled="true" height="19" hidden="false" label="Show Tips"
-			     left="0" mouse_opaque="true" name="Show Tips" shortcut="control|shift|T"
-			     width="158">
+		<menu_item_separator bottom="-346" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator4" width="211" />
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="79" label="Hover Tips" left="0" mouse_opaque="false"
+		     name="Hover Tips" opaque="true" tear_off="true" width="158">
+			<menu_item_check bottom="-29" enabled="true" height="19" label="Show Tips" left="0"
+			     mouse_opaque="true" name="Show Tips" shortcut="control|shift|T" width="158">
 				<on_click function="View.ShowHoverTips" userdata="" />
 				<on_check function="View.CheckShowHoverTips" />
 			</menu_item_check>
-			<menu_item_separator bottom="-37" enabled="true" height="8" hidden="false" label="-----------"
-			     left="0" mouse_opaque="true" name="separator" width="158" />
-			<menu_item_check bottom="-56" enabled="true" height="19" hidden="false" label="Land Tips"
-			     left="0" mouse_opaque="true" name="Land Tips" width="158">
+			<menu_item_separator bottom="-37" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator" width="158" />
+			<menu_item_check bottom="-56" enabled="true" height="19" label="Land Tips" left="0"
+			     mouse_opaque="true" name="Land Tips" width="158">
 				<on_click function="ToggleControl" userdata="ShowLandHoverTip" />
 				<on_enable function="View.CheckShowHoverTips" />
 				<on_check control="ShowLandHoverTip" />
 			</menu_item_check>
-			<menu_item_check bottom="-75" enabled="true" height="19" hidden="false"
-			     label="Tips On All Objects" left="0" mouse_opaque="true"
-			     name="Tips On All Objects" width="158">
+			<menu_item_check bottom="-75" enabled="true" height="19" label="Tips On All Objects" left="0"
+			     mouse_opaque="true" name="Tips On All Objects" width="158">
 				<on_click function="ToggleControl" userdata="ShowAllObjectHoverTip" />
 				<on_enable function="View.CheckShowHoverTips" />
 				<on_check control="ShowAllObjectHoverTip" />
 			</menu_item_check>
 		</menu>
-		<menu_item_check bottom="-403" enabled="true" height="19" hidden="false"
-		     label="Highlight Transparent" left="0" mouse_opaque="true"
-		     name="Highlight Transparent" shortcut="control|alt|T" width="211">
+		<menu_item_check bottom="-403" enabled="true" height="19" label="Highlight Transparent" left="0"
+		     mouse_opaque="true" name="Highlight Transparent" shortcut="control|alt|T"
+		     width="211">
 			<on_click function="View.HighlightTransparent" userdata="" />
 			<on_check function="View.CheckHighlightTransparent" />
 		</menu_item_check>
-		<menu_item_check bottom="-384" enabled="true" height="19" hidden="false"
-		     label="Beacons Always On" left="0" mouse_opaque="true"
-		     name="Beacons Always On" width="211" shortcut="control|N">
+		<menu_item_check bottom="-384" enabled="true" height="19" label="Beacons Always On" left="0"
+		     mouse_opaque="true" name="Beacons Always On" shortcut="control|N"
+		     width="211">
 			<on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
 			<on_check control="BeaconAlwaysOn" />
 		</menu_item_check>
-		<menu bottom="-554" drop_shadow="true" enabled="true" height="117"
-		     hidden="false" label="Beacons" left="0" mouse_opaque="false" name="Beacons"
-		     opaque="true" tear_off="true" create_jump_keys="true" width="129">
-		    <menu_item_check bottom="-29" enabled="true" height="19" hidden="false" label="Scripted Objects with Touch Only"
-			     left="0" mouse_opaque="true" name="Scripted Objects With Touch Only" width="129">
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="117" label="Beacons" left="0" mouse_opaque="false" name="Beacons"
+		     opaque="true" tear_off="true" width="129">
+			<menu_item_check bottom="-29" enabled="true" height="19"
+			     label="Scripted Objects with Touch Only" left="0" mouse_opaque="true"
+			     name="Scripted Objects With Touch Only" width="129">
 				<on_click function="View.ToggleBeacon" userdata="scripttouchbeacon" />
 				<on_check function="View.CheckBeaconEnabled" userdata="scripttouchbeacon" />
 			</menu_item_check>
-			<menu_item_check bottom="-48" enabled="true" height="19" hidden="false" label="Scripted Objects"
-			     left="0" mouse_opaque="true" name="Scripted Objects" width="129">
+			<menu_item_check bottom="-48" enabled="true" height="19" label="Scripted Objects" left="0"
+			     mouse_opaque="true" name="Scripted Objects" width="129">
 				<on_click function="View.ToggleBeacon" userdata="scriptsbeacon" />
 				<on_check function="View.CheckBeaconEnabled" userdata="scriptsbeacon" />
 			</menu_item_check>
-			<menu_item_check bottom="-67" enabled="true" height="19" hidden="false" label="Physical Objects"
-			     left="0" mouse_opaque="true" name="Physical Objects" width="129">
+			<menu_item_check bottom="-67" enabled="true" height="19" label="Physical Objects" left="0"
+			     mouse_opaque="true" name="Physical Objects" width="129">
 				<on_click function="View.ToggleBeacon" userdata="physicalbeacon" />
 				<on_check function="View.CheckBeaconEnabled" userdata="physicalbeacon" />
 			</menu_item_check>
-			<menu_item_check bottom="-86" enabled="true" height="19" hidden="false" label="Sound Sources"
-			     left="0" mouse_opaque="true" name="Sound Sources" width="129">
+			<menu_item_check bottom="-86" enabled="true" height="19" label="Sound Sources" left="0"
+			     mouse_opaque="true" name="Sound Sources" width="129">
 				<on_click function="View.ToggleBeacon" userdata="soundsbeacon" />
 				<on_check function="View.CheckBeaconEnabled" userdata="soundsbeacon" />
 			</menu_item_check>
-			<menu_item_check bottom="-105" enabled="true" height="19" hidden="false" label="Particle Sources"
-			     left="0" mouse_opaque="true" name="Particle Sources" width="129">
+			<menu_item_check bottom="-105" enabled="true" height="19" label="Particle Sources" left="0"
+			     mouse_opaque="true" name="Particle Sources" width="129">
 				<on_click function="View.ToggleBeacon" userdata="particlesbeacon" />
 				<on_check function="View.CheckBeaconEnabled" userdata="particlesbeacon" />
 			</menu_item_check>
-			<menu_item_separator bottom="-113" enabled="true" height="8" hidden="false" label="-----------"
-			     left="0" mouse_opaque="true" name="separator" width="129" />
-			<menu_item_check bottom="-121" enabled="true" height="19" hidden="false" label="Render Highlights"
-			     left="0" mouse_opaque="true" name="Render Highlights" width="129">
+			<menu_item_separator bottom="-113" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator" width="129" />
+			<menu_item_check bottom="-121" enabled="true" height="19" label="Render Highlights" left="0"
+			     mouse_opaque="true" name="Render Highlights" width="129">
 				<on_click function="View.ToggleBeacon" userdata="renderhighlights" />
 				<on_check function="View.CheckBeaconEnabled" userdata="renderhighlights" />
 			</menu_item_check>
-			<menu_item_check bottom="-140" enabled="true" height="19" hidden="false" label="Render Beacons"
-			     left="0" mouse_opaque="true" name="Render Beacons" width="129">
+			<menu_item_check bottom="-140" enabled="true" height="19" label="Render Beacons" left="0"
+			     mouse_opaque="true" name="Render Beacons" width="129">
 				<on_click function="View.ToggleBeacon" userdata="renderbeacons" />
 				<on_check function="View.CheckBeaconEnabled" userdata="renderbeacons" />
 			</menu_item_check>
-			<menu_item_separator bottom="-159" enabled="true" height="8" hidden="false" label="-----------"
-			     left="0" mouse_opaque="true" name="separator" width="129" />
-			<menu_item_check bottom="-167" enabled="true" height="19" hidden="false" label="Hide Particles"
-			     left="0" mouse_opaque="true" name="Hide Particles" width="129">
+			<menu_item_separator bottom="-159" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator2" width="129" />
+			<menu_item_check bottom="-167" enabled="true" height="19" label="Hide Particles" left="0"
+			     mouse_opaque="true" name="Hide Particles" width="129">
 				<on_click function="View.ToggleRenderType" userdata="hideparticles" />
 				<on_check function="View.CheckRenderType" userdata="hideparticles" />
 			</menu_item_check>
+			<menu_item_separator bottom="-186" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator3" width="129" />
+			<menu bottom="-205" color="0 0 0 1" create_jump_keys="true" drop_shadow="true"
+			     enabled="true" height="117" hidden="false" label="Beacon Width" left="0"
+			     mouse_opaque="false" name="Beacon Width" opaque="true" tear_off="true"
+			     width="129">
+				<menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="1" left="0"
+				     mouse_opaque="true" name="Beacon Width 1" width="188">
+					<on_click function="View.BeaconWidth" userdata="1" />
+				</menu_item_call>
+				<menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="4" left="0"
+				     mouse_opaque="true" name="Beacon Width 4" width="188">
+					<on_click function="View.BeaconWidth" userdata="4" />
+				</menu_item_call>
+				<menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="16" left="0"
+				     mouse_opaque="true" name="Beacon Width 16" width="188">
+					<on_click function="View.BeaconWidth" userdata="16" />
+				</menu_item_call>
+				<menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="32" left="0"
+				     mouse_opaque="true" name="Beacon Width 32" width="188">
+					<on_click function="View.BeaconWidth" userdata="32" />
+				</menu_item_call>
+			</menu>
 		</menu>
-		<menu_item_check bottom="-441" enabled="true" height="19" hidden="false"
-		     label="Show HUD Attachments" left="0" mouse_opaque="true"
-		     name="Show HUD Attachments" shortcut="alt|shift|H" width="211">
+		<menu_item_check bottom="-441" enabled="true" height="19" label="Show HUD Attachments" left="0"
+		     mouse_opaque="true" name="Show HUD Attachments" shortcut="alt|shift|H"
+		     width="211">
 			<on_click function="View.ShowHUDAttachments" userdata="" />
 			<on_check function="View.CheckHUDAttachments" />
 		</menu_item_check>
-		<menu_item_separator bottom="-449" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator5" width="211" />
-		<menu_item_call bottom="-468" enabled="true" height="19" hidden="false" label="Zoom In"
-		     left="0" mouse_opaque="true" name="Zoom In" shortcut="control|0"
-		     width="211">
+		<menu_item_separator bottom="-449" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator5" width="211" />
+		<menu_item_call bottom="-468" enabled="true" height="19" label="Zoom In" left="0"
+		     mouse_opaque="true" name="Zoom In" shortcut="control|0" width="211">
 			<on_click function="View.ZoomIn" userdata="" />
 		</menu_item_call>
-		<menu_item_call bottom="-487" enabled="true" height="19" hidden="false" label="Zoom Default"
-		     left="0" mouse_opaque="true" name="Zoom Default" shortcut="control|9"
-		     width="211">
+		<menu_item_call bottom="-487" enabled="true" height="19" label="Zoom Default" left="0"
+		     mouse_opaque="true" name="Zoom Default" shortcut="control|9" width="211">
 			<on_click function="View.ZoomDefault" userdata="" />
 		</menu_item_call>
-		<menu_item_call bottom="-506" enabled="true" height="19" hidden="false" label="Zoom Out"
-		     left="0" mouse_opaque="true" name="Zoom Out" shortcut="control|8"
-		     width="211">
+		<menu_item_call bottom="-506" enabled="true" height="19" label="Zoom Out" left="0"
+		     mouse_opaque="true" name="Zoom Out" shortcut="control|8" width="211">
 			<on_click function="View.ZoomOut" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-514" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator6" width="211" />
-		<menu_item_call bottom="-19" enabled="true" height="19" hidden="false"
-		     label="Toggle Fullscreen" left="0" mouse_opaque="true"
-		     name="Toggle Fullscreen" shortcut="alt|Enter" width="188">
+		<menu_item_separator bottom="-514" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator6" width="211" />
+		<menu_item_call bottom="-19" enabled="true" height="19" label="Toggle Fullscreen" left="0"
+		     mouse_opaque="true" name="Toggle Fullscreen" shortcut="alt|Enter"
+		     width="188">
 			<on_click function="View.Fullscreen" userdata="" />
 		</menu_item_call>
-		<menu_item_call bottom="-38" enabled="true" height="19" hidden="false"
-		     label="Set UI Size to Default" left="0" mouse_opaque="true"
-		     name="Set UI Size to Default" width="188">
+		<menu_item_call bottom="-38" enabled="true" height="19" label="Set UI Size to Default" left="0"
+		     mouse_opaque="true" name="Set UI Size to Default" width="188">
 			<on_click function="View.DefaultUISize" userdata="" />
 		</menu_item_call>
 	</menu>
-	<menu bottom="-18" drop_shadow="true" enabled="true" height="339"
-	     hidden="false" label="World" left="0" mouse_opaque="false" name="World"
-	     opaque="true" tear_off="true" create_jump_keys="true" width="185">
-		<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Chat" left="0"
+	<menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="339" label="World" left="0" mouse_opaque="false" name="World"
+	     opaque="true" tear_off="true" width="185">
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Chat" left="0"
 		     mouse_opaque="true" name="Chat" shortcut="" width="185">
 			<on_click function="World.Chat" userdata="" />
 		</menu_item_call>
-		<menu_item_call bottom="-48" enabled="true" height="19" hidden="false" label="Start Gesture"
-		     left="0" mouse_opaque="true" name="Start Gesture" shortcut="/" width="185">
+		<menu_item_call bottom="-48" enabled="true" height="19" label="Start Gesture" left="0"
+		     mouse_opaque="true" name="Start Gesture" shortcut="/" width="185">
 			<on_click function="World.StartGesture" userdata="" />
 		</menu_item_call>
-		<menu_item_check bottom="-67" enabled="true" height="19" hidden="false" label="Always Run"
-		     left="0" mouse_opaque="true" name="Always Run" shortcut="control|R"
-		     width="185">
+		<menu_item_check bottom="-67" enabled="true" height="19" label="Always Run" left="0"
+		     mouse_opaque="true" name="Always Run" shortcut="control|R" width="185">
 			<on_click function="World.AlwaysRun" userdata="" />
 			<on_check function="World.CheckAlwaysRun" userdata="" />
 		</menu_item_check>
-		<menu_item_check bottom="-86" enabled="true" height="19" hidden="false" label="Fly" left="0"
+		<menu_item_check bottom="-86" enabled="true" height="19" label="Fly" left="0"
 		     mouse_opaque="true" name="Fly" shortcut="Home" width="185">
 			<on_click function="World.Fly" userdata="" />
 			<on_check control="FlyBtnState" />
 		</menu_item_check>
-		<menu_item_separator bottom="-94" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator" width="185" />
-		<menu_item_call bottom="-113" enabled="true" height="19" hidden="false"
-		     label="Create Landmark Here" left="0" mouse_opaque="true"
-		     name="Create Landmark Here" width="185">
+		<menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator" width="185" />
+		<menu_item_call bottom="-113" enabled="true" height="19" label="Create Landmark Here" left="0"
+		     mouse_opaque="true" name="Create Landmark Here" width="185">
 			<on_click function="World.CreateLandmark" userdata="" />
 			<on_enable function="World.EnableCreateLandmark" userdata="" />
 		</menu_item_call>
-		<menu_item_call bottom="-132" enabled="true" height="19" hidden="false"
-		     label="Set Home to Here" left="0" mouse_opaque="true"
-		     name="Set Home to Here" width="185">
+		<menu_item_call bottom="-132" enabled="true" height="19" label="Set Home to Here" left="0"
+		     mouse_opaque="true" name="Set Home to Here" width="185">
 			<on_click function="World.SetHomeLocation" userdata="" />
 			<on_enable function="World.EnableSetHomeLocation" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-140" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator2" width="185" />
-		<menu_item_call bottom="-159" enabled="true" height="19" hidden="false" label="Teleport Home"
-		     left="0" mouse_opaque="true" name="Teleport Home"
-		     shortcut="control|shift|H" width="185">
+		<menu_item_separator bottom="-140" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator2" width="185" />
+		<menu_item_call bottom="-159" enabled="true" height="19" label="Teleport Home" left="0"
+		     mouse_opaque="true" name="Teleport Home" shortcut="control|shift|H"
+		     width="185">
 			<on_click function="World.TeleportHome" userdata="" />
 			<on_enable function="World.EnableTeleportHome" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-167" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator3" width="185" />
-		<menu_item_call bottom="-186" enabled="true" height="19" hidden="false" label="Set Away"
-		     left="0" mouse_opaque="true" name="Set Away" width="185">
+		<menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator3" width="185" />
+		<menu_item_call bottom="-186" enabled="true" height="19" label="Set Away" left="0"
+		     mouse_opaque="true" name="Set Away" width="185">
 			<on_click function="World.SetAway" userdata="" />
 		</menu_item_call>
-		<menu_item_call bottom="-205" enabled="true" height="19" hidden="false" label="Set Busy"
-		     left="0" mouse_opaque="true" name="Set Busy" width="185">
+		<menu_item_call bottom="-205" enabled="true" height="19" label="Set Busy" left="0"
+		     mouse_opaque="true" name="Set Busy" width="185">
 			<on_click function="World.SetBusy" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-213" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator4" width="185" />
-		<menu_item_call bottom="-232" enabled="true" height="19" hidden="false"
-		     label="Account History..." left="0" mouse_opaque="true"
-		     name="Account History..." width="185">
+		<menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator4" width="185" />
+		<menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
+		     mouse_opaque="true" name="Account History..." width="185">
 			<on_click function="PromptShowURL"
 			     userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
 		</menu_item_call>
-		<menu_item_call bottom="-267" enabled="true" height="19" hidden="false"
-		     label="Manage My Account..." left="0" mouse_opaque="true"
-		     name="Manage My Account..." width="166">
+		<menu_item_call bottom="-267" enabled="true" height="19" label="Manage My Account..." left="0"
+		     mouse_opaque="true" name="Manage My Account..." width="166">
 			<on_click function="PromptShowURL"
 			     userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
 		</menu_item_call>
-		<menu_item_call bottom="-286" enabled="true" height="19" hidden="false" label="Buy L$..."
-		     left="0" mouse_opaque="true" name="Buy and Sell L$..." width="166">
+		<menu_item_call bottom="-286" enabled="true" height="19" label="Buy L$..." left="0"
+		     mouse_opaque="true" name="Buy and Sell L$..." width="166">
 			<on_click function="ShowFloater" userdata="buy currency" />
 		</menu_item_call>
-		<menu_item_separator bottom="-213" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator5" width="185" />
-		<menu_item_call bottom="-251" enabled="true" height="19" hidden="false" label="My Land..."
-		     left="0" mouse_opaque="true" name="My Land..." width="185">
+		<menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator5" width="185" />
+		<menu_item_call bottom="-251" enabled="true" height="19" label="My Land..." left="0"
+		     mouse_opaque="true" name="My Land..." width="185">
 			<on_click function="ShowFloater" userdata="my land" />
 		</menu_item_call>
-		<menu_item_call bottom="-270" enabled="true" height="19" hidden="false" label="About Land..."
-		     left="0" mouse_opaque="true" name="About Land..." width="185">
+		<menu_item_call bottom="-270" enabled="true" height="19" label="About Land..." left="0"
+		     mouse_opaque="true" name="About Land..." width="185">
 			<on_click function="ShowFloater" userdata="about land" />
 		</menu_item_call>
-		<menu_item_call bottom="-289" enabled="true" height="19" hidden="false" label="Buy Land..."
-		     left="0" mouse_opaque="true" name="Buy Land..." width="185">
+		<menu_item_call bottom="-289" enabled="true" height="19" label="Buy Land..." left="0"
+		     mouse_opaque="true" name="Buy Land..." width="185">
 			<on_click function="ShowFloater" userdata="buy land" />
 			<on_enable function="World.EnableBuyLand" />
 		</menu_item_call>
-		<menu_item_call bottom="-308" enabled="true" height="19" hidden="false"
-		     label="Region/Estate..." left="0" mouse_opaque="true"
-		     name="Region/Estate..." width="185">
+		<menu_item_call bottom="-308" enabled="true" height="19" label="Region/Estate..." left="0"
+		     mouse_opaque="true" name="Region/Estate..." width="185">
 			<on_click function="ShowFloater" userdata="about region" />
 		</menu_item_call>
-		<menu_item_separator bottom="-316" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator6" width="185" />
-		<menu bottom="-554" drop_shadow="true" enabled="true" height="117"
-		     hidden="false" label="Force Sun" left="0" mouse_opaque="false"
-		     name="Force Sun" opaque="true" tear_off="true" create_jump_keys="true"
-		     width="169">
-			<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Sunrise" left="0"
+		<menu_item_separator bottom="-316" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator6" width="185" />
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="117" label="Environment Settings" left="0" mouse_opaque="false"
+		     name="Environment Settings" opaque="true" tear_off="true" width="169">
+			<menu_item_call bottom="-29" enabled="true" height="19" label="Sunrise" left="0"
 			     mouse_opaque="true" name="Sunrise" width="169">
-				<on_click function="World.ForceSun" userdata="sunrise" />
+				<on_click function="World.EnvSettings" userdata="sunrise" />
 			</menu_item_call>
-			<menu_item_call bottom="-48" enabled="true" height="19" hidden="false" label="Noon" left="0"
+			<menu_item_call bottom="-48" enabled="true" height="19" label="Midday" left="0"
 			     mouse_opaque="true" name="Noon" shortcut="control|shift|Y" width="169">
-				<on_click function="World.ForceSun" userdata="noon" />
+				<on_click function="World.EnvSettings" userdata="noon" />
 			</menu_item_call>
-			<menu_item_call bottom="-67" enabled="true" height="19" hidden="false" label="Sunset" left="0"
+			<menu_item_call bottom="-67" enabled="true" height="19" label="Sunset" left="0"
 			     mouse_opaque="true" name="Sunset" shortcut="control|shift|N" width="169">
-				<on_click function="World.ForceSun" userdata="sunset" />
+				<on_click function="World.EnvSettings" userdata="sunset" />
 			</menu_item_call>
-			<menu_item_call bottom="-86" enabled="true" height="19" hidden="false" label="Midnight"
-			     left="0" mouse_opaque="true" name="Midnight" width="169">
-				<on_click function="World.ForceSun" userdata="midnight" />
+			<menu_item_call bottom="-86" enabled="true" height="19" label="Midnight" left="0"
+			     mouse_opaque="true" name="Midnight" width="169">
+				<on_click function="World.EnvSettings" userdata="midnight" />
 			</menu_item_call>
-			<menu_item_separator bottom="-94" enabled="true" height="8" hidden="false" label="-----------"
+			<menu_item_call bottom="-105" enabled="false" height="19" label="Revert to Region Default"
+			     left="0" mouse_opaque="true" name="Revert to Region Default" width="169">
+				<on_click function="World.EnvSettings" userdata="default" />
+			</menu_item_call>
+			<menu_item_separator bottom="-113" enabled="true" height="8" hidden="false" label="-----------"
 			     left="0" mouse_opaque="true" name="separator" width="169" />
-			<menu_item_call bottom="-113" enabled="false" height="19" hidden="false"
-			     label="Revert to Region Default" left="0" mouse_opaque="true"
-			     name="Revert to Region Default" width="169">
-				<on_click function="World.ForceSun" userdata="default" />
+			<menu_item_call bottom="-132" enabled="false" height="19" hidden="false"
+			     label="Environment Editor" left="0" mouse_opaque="true"
+			     name="Environment Editor" width="169">
+				<on_click function="World.EnvSettings" userdata="editor" />
 			</menu_item_call>
 		</menu>
 	</menu>
-	<menu bottom="-18" drop_shadow="true" enabled="true" height="510"
-	     hidden="false" label="Tools" left="0" mouse_opaque="false" name="Tools"
-	     opaque="true" tear_off="true" create_jump_keys="true" width="250">
-		<menu bottom="-554" drop_shadow="true" enabled="true" height="109"
-		     hidden="false" label="Select Tool" left="0" mouse_opaque="false"
-		     name="Select Tool" opaque="true" tear_off="true" create_jump_keys="true"
-		     width="118">
-			<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Focus" left="0"
+	<menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="510" label="Tools" left="0" mouse_opaque="false" name="Tools"
+	     opaque="true" tear_off="true" width="250">
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="109" label="Select Tool" left="0" mouse_opaque="false"
+		     name="Select Tool" opaque="true" tear_off="true" width="118">
+			<menu_item_call bottom="-29" enabled="true" height="19" label="Focus" left="0"
 			     mouse_opaque="true" name="Focus" shortcut="control|1" width="118">
 				<on_click function="Tools.SelectTool" userdata="focus" />
 			</menu_item_call>
-			<menu_item_call bottom="-48" enabled="true" height="19" hidden="false" label="Move" left="0"
+			<menu_item_call bottom="-48" enabled="true" height="19" label="Move" left="0"
 			     mouse_opaque="true" name="Move" shortcut="control|2" width="118">
 				<on_click function="Tools.SelectTool" userdata="move" />
 			</menu_item_call>
-			<menu_item_call bottom="-67" enabled="true" height="19" hidden="false" label="Edit" left="0"
+			<menu_item_call bottom="-67" enabled="true" height="19" label="Edit" left="0"
 			     mouse_opaque="true" name="Edit" shortcut="control|3" width="118">
 				<on_click function="Tools.SelectTool" userdata="edit" />
 			</menu_item_call>
-			<menu_item_call bottom="-86" enabled="true" height="19" hidden="false" label="Create" left="0"
+			<menu_item_call bottom="-86" enabled="true" height="19" label="Create" left="0"
 			     mouse_opaque="true" name="Create" shortcut="control|4" width="118">
 				<on_click function="Tools.SelectTool" userdata="create" />
 			</menu_item_call>
-			<menu_item_call bottom="-105" enabled="true" height="19" hidden="false" label="Land" left="0"
+			<menu_item_call bottom="-105" enabled="true" height="19" label="Land" left="0"
 			     mouse_opaque="true" name="Land" shortcut="control|5" width="118">
 				<on_click function="Tools.SelectTool" userdata="land" />
 			</menu_item_call>
 		</menu>
-		<menu_item_separator bottom="-37" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator" width="250" />
-		<menu_item_check bottom="-56" enabled="true" height="19" hidden="false"
-		     label="Select Only My Objects" left="0" mouse_opaque="true"
-		     name="Select Only My Objects" width="250">
+		<menu_item_separator bottom="-37" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator" width="250" />
+		<menu_item_check bottom="-56" enabled="true" height="19" label="Select Only My Objects" left="0"
+		     mouse_opaque="true" name="Select Only My Objects" width="250">
 			<on_click function="Tools.SelectOnlyMyObjects" userdata="agents" />
 			<on_check control="SelectOwnedOnly" />
 		</menu_item_check>
-		<menu_item_check bottom="-75" enabled="true" height="19" hidden="false"
-		     label="Select Only Movable Objects" left="0" mouse_opaque="true"
-		     name="Select Only Movable Objects" width="250">
+		<menu_item_check bottom="-75" enabled="true" height="19" label="Select Only Movable Objects"
+		     left="0" mouse_opaque="true" name="Select Only Movable Objects" width="250">
 			<on_click function="Tools.SelectOnlyMovableObjects" userdata="movable" />
 			<on_check control="SelectMovableOnly" />
 		</menu_item_check>
-		<menu_item_check bottom="-94" enabled="true" height="19" hidden="false"
-		     label="Select By Surrounding" left="0" mouse_opaque="true"
-		     name="Select By Surrounding" width="250">
+		<menu_item_check bottom="-94" enabled="true" height="19" label="Select By Surrounding" left="0"
+		     mouse_opaque="true" name="Select By Surrounding" width="250">
 			<on_click function="Tools.SelectBySurrounding" userdata="" />
 			<on_check control="RectangleSelectInclusive" />
 		</menu_item_check>
-		<menu_item_check bottom="-113" enabled="true" height="19" hidden="false"
-		     label="Show Hidden Selection" left="0" mouse_opaque="true"
-		     name="Show Hidden Selection" width="250">
+		<menu_item_check bottom="-113" enabled="true" height="19" label="Show Hidden Selection" left="0"
+		     mouse_opaque="true" name="Show Hidden Selection" width="250">
 			<on_click function="Tools.ShowHiddenSelection" userdata="" />
 			<on_check control="RenderHiddenSelections" />
 		</menu_item_check>
-		<menu_item_check bottom="-132" enabled="true" height="19" hidden="false"
+		<menu_item_check bottom="-132" enabled="true" height="19"
 		     label="Show Light Radius for Selection" left="0" mouse_opaque="true"
 		     name="Show Light Radius for Selection" width="250">
 			<on_click function="Tools.ShowSelectionLightRadius" userdata="" />
 			<on_check control="RenderLightRadius" />
 		</menu_item_check>
-		<menu_item_check bottom="-151" enabled="true" height="19" hidden="false"
-		     label="Show Selection Beam" left="0" mouse_opaque="true"
-		     name="Show Selection Beam" width="250">
+		<menu_item_check bottom="-151" enabled="true" height="19" label="Show Selection Beam" left="0"
+		     mouse_opaque="true" name="Show Selection Beam" width="250">
 			<on_click function="ToggleControl" userdata="ShowSelectionBeam" />
 			<on_check control="ShowSelectionBeam" />
 		</menu_item_check>
-		<menu_item_separator bottom="-159" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator2" width="250" />
-		<menu_item_check bottom="-178" enabled="false" height="19" hidden="false" label="Snap to Grid"
-		     left="0" mouse_opaque="true" name="Snap to Grid" shortcut="G" width="250">
+		<menu_item_separator bottom="-159" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator2" width="250" />
+		<menu_item_check bottom="-178" enabled="false" height="19" label="Snap to Grid" left="0"
+		     mouse_opaque="true" name="Snap to Grid" shortcut="G" width="250">
 			<on_click function="ToggleControl" userdata="SnapEnabled" />
 			<on_check control="SnapEnabled" />
 			<on_enable function="Tools.EnableToolNotPie" />
 		</menu_item_check>
-		<menu_item_call bottom="-197" enabled="false" height="19" hidden="false"
-		     label="Snap Object XY to Grid" left="0" mouse_opaque="true"
-		     name="Snap Object XY to Grid" shortcut="shift|X" width="250">
+		<menu_item_call bottom="-197" enabled="false" height="19" label="Snap Object XY to Grid"
+		     left="0" mouse_opaque="true" name="Snap Object XY to Grid"
+		     shortcut="shift|X" width="250">
 			<on_click function="Tools.SnapObjectXY" userdata="" />
 			<on_enable function="Tools.EnableToolNotPie" />
 		</menu_item_call>
-		<menu_item_call bottom="-216" enabled="false" height="19" hidden="false"
-		     label="Use Selection for Grid" left="0" mouse_opaque="true"
-		     name="Use Selection for Grid" shortcut="shift|G" width="250">
+		<menu_item_call bottom="-216" enabled="false" height="19" label="Use Selection for Grid"
+		     left="0" mouse_opaque="true" name="Use Selection for Grid"
+		     shortcut="shift|G" width="250">
 			<on_click function="Tools.UseSelectionForGrid" userdata="" />
 			<on_enable function="SomethingSelected" />
 		</menu_item_call>
-		<menu_item_call bottom="-235" enabled="false" height="19" hidden="false"
-		     label="Grid Options..." left="0" mouse_opaque="true" name="Grid Options..."
-		     shortcut="control|shift|B" width="250">
+		<menu_item_call bottom="-235" enabled="false" height="19" label="Grid Options..." left="0"
+		     mouse_opaque="true" name="Grid Options..." shortcut="control|shift|B"
+		     width="250">
 			<on_click function="ShowFloater" userdata="grid options" />
 			<on_enable function="Tools.EnableToolNotPie" />
 		</menu_item_call>
-		<menu_item_separator bottom="-243" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator3" width="250" />
-		<menu_item_check bottom="" enabled="false" height="" hidden="false" label="Edit Linked Parts"
-		     left="" mouse_opaque="true" name="Edit Linked Parts" shortcut="" width="">
+		<menu_item_separator bottom="-243" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator3" width="250" />
+		<menu_item_check bottom="" enabled="false" height="" label="Edit Linked Parts" left=""
+		     mouse_opaque="true" name="Edit Linked Parts" shortcut="" width="">
 			<on_click function="ToggleControl" userdata="EditLinkedParts" />
 			<on_click function="Tools.EditLinkedParts" userdata="" />
 			<on_check control="EditLinkedParts" />
 			<on_enable function="Tools.EnableToolNotPie" />
 		</menu_item_check>
-		<menu_item_call bottom="-262" enabled="false" height="19" hidden="false" label="Link" left="0"
+		<menu_item_call bottom="-262" enabled="false" height="19" label="Link" left="0"
 		     mouse_opaque="true" name="Link" shortcut="control|L" width="250">
 			<on_click function="Tools.Link" userdata="" />
 			<on_enable function="Tools.EnableLink" />
 		</menu_item_call>
-		<menu_item_call bottom="-281" enabled="false" height="19" hidden="false" label="Unlink"
-		     left="0" mouse_opaque="true" name="Unlink" shortcut="control|shift|L"
-		     width="250">
+		<menu_item_call bottom="-281" enabled="false" height="19" label="Unlink" left="0"
+		     mouse_opaque="true" name="Unlink" shortcut="control|shift|L" width="250">
 			<on_click function="Tools.Unlink" userdata="" />
 			<on_enable function="Tools.EnableUnlink" />
 		</menu_item_call>
-		<menu_item_separator bottom="-289" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator4" width="250" />
-		<menu_item_call bottom="-281" enabled="false" height="19" hidden="false"
-		     label="Stop All Animations" left="0" mouse_opaque="true"
-		     name="Stop All Animations" width="250">
+		<menu_item_separator bottom="-289" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator4" width="250" />
+		<menu_item_call bottom="-281" enabled="false" height="19" label="Stop All Animations" left="0"
+		     mouse_opaque="true" name="Stop All Animations" width="250">
 			<on_click function="Tools.StopAllAnimations" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-289" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator5" width="250" />
-		<menu_item_call bottom="-308" enabled="false" height="19" hidden="false"
-		     label="Focus on Selection" left="0" mouse_opaque="true"
-		     name="Focus on Selection" shortcut="H" width="250">
+		<menu_item_separator bottom="-289" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator5" width="250" />
+		<menu_item_call bottom="-308" enabled="false" height="19" label="Focus on Selection" left="0"
+		     mouse_opaque="true" name="Focus on Selection" shortcut="H" width="250">
 			<on_click function="Tools.LookAtSelection" userdata="focus" />
 			<on_enable function="Tools.SomethingSelectedNoHUD" />
 		</menu_item_call>
-		<menu_item_call bottom="-327" enabled="false" height="19" hidden="false"
-		     label="Zoom to Selection" left="0" mouse_opaque="true"
-		     name="Zoom to Selection" shortcut="shift|H" width="250">
+		<menu_item_call bottom="-327" enabled="false" height="19" label="Zoom to Selection" left="0"
+		     mouse_opaque="true" name="Zoom to Selection" shortcut="shift|H" width="250">
 			<on_click function="Tools.LookAtSelection" userdata="zoom" />
 			<on_enable function="Tools.SomethingSelectedNoHUD" />
 		</menu_item_call>
-		<menu_item_call bottom="-346" enabled="false" height="19" hidden="true" label="Buy Object"
-		     left="0" mouse_opaque="true" name="Menu Object Take" width="250">
+		<menu_item_call bottom="-346" enabled="false" height="19" label="Buy Object" left="0"
+		     mouse_opaque="true" name="Menu Object Take" visible="false" width="250">
 			<on_click function="Tools.BuyOrTake" userdata="" />
 			<on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
 		</menu_item_call>
-		<menu_item_call bottom="-365" enabled="false" height="19" hidden="false" label="Take Copy"
-		     left="0" mouse_opaque="true" name="Take Copy" width="250">
+		<menu_item_call bottom="-365" enabled="false" height="19" label="Take Copy" left="0"
+		     mouse_opaque="true" name="Take Copy" width="250">
 			<on_click function="Tools.TakeCopy" userdata="" />
 			<on_enable function="Tools.EnableTakeCopy" />
 		</menu_item_call>
-		<menu_item_call bottom="-384" enabled="false" height="19" hidden="false"
+		<menu_item_call bottom="-384" enabled="false" height="19"
 		     label="Save Object Back to My Inventory" left="0" mouse_opaque="true"
 		     name="Save Object Back to My Inventory" width="250">
 			<on_click function="Tools.SaveToInventory" userdata="" />
 			<on_enable function="Tools.EnableSaveToInventory" />
 		</menu_item_call>
-		<menu_item_call bottom="-403" enabled="false" height="19" hidden="false"
+		<menu_item_call bottom="-403" enabled="false" height="19"
 		     label="Save Object Back to Object Contents" left="0" mouse_opaque="true"
 		     name="Save Object Back to Object Contents" width="250">
 			<on_click function="Tools.SaveToObjectInventory" userdata="" />
 			<on_enable function="Tools.EnableSaveToObjectInventory" />
 		</menu_item_call>
-		<menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator6" width="250" />
-		<menu_item_call bottom="-430" enabled="true" height="19" hidden="false"
+		<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator6" width="250" />
+		<menu_item_call bottom="-430" enabled="true" height="19"
 		     label="Show Script Warning/Error Window" left="0" mouse_opaque="true"
 		     name="Show Script Warning/Error Window" width="250">
 			<on_click function="ShowFloater" userdata="script errors" />
 		</menu_item_call>
-		<menu_item_call bottom="-449" enabled="false" height="19" hidden="false"
+		<menu_item_call bottom="-449" enabled="false" height="19"
 		     label="Recompile Scripts in Selection" left="0" mouse_opaque="true"
 		     name="Recompile Scripts in Selection" width="250">
 			<on_click function="Tools.SelectedScriptAction" userdata="compile" />
 			<on_enable function="EditableSelected" />
 		</menu_item_call>
-		<menu_item_call bottom="-468" enabled="false" height="19" hidden="false"
-		     label="Reset Scripts in Selection" left="0" mouse_opaque="true"
-		     name="Reset Scripts in Selection" width="250">
+		<menu_item_call bottom="-468" enabled="false" height="19" label="Reset Scripts in Selection"
+		     left="0" mouse_opaque="true" name="Reset Scripts in Selection" width="250">
 			<on_click function="Tools.SelectedScriptAction" userdata="reset" />
 			<on_enable function="EditableSelected" />
 		</menu_item_call>
-		<menu_item_call bottom="-487" enabled="false" height="19" hidden="false"
+		<menu_item_call bottom="-487" enabled="false" height="19"
 		     label="Set Scripts to Running in Selection" left="0" mouse_opaque="true"
 		     name="Set Scripts to Running in Selection" width="250">
 			<on_click function="Tools.SelectedScriptAction" userdata="start" />
 			<on_enable function="EditableSelected" />
 		</menu_item_call>
-		<menu_item_call bottom="-506" enabled="false" height="19" hidden="false"
+		<menu_item_call bottom="-506" enabled="false" height="19"
 		     label="Set Scripts to Not Running in Selection" left="0"
 		     mouse_opaque="true" name="Set Scripts to Not Running in Selection"
 		     width="250">
 			<on_click function="Tools.SelectedScriptAction" userdata="stop" />
 			<on_enable function="EditableSelected" />
 		</menu_item_call>
-			<menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
-			left="0" mouse_opaque="true" name="separator7" width="250" />
-			<menu bottom="-554" drop_shadow="true" enabled="true" height="109"
-		     hidden="false" label="Bug Reporting" left="0" mouse_opaque="false"
-		     name="Bug Reporting" opaque="true" tear_off="true" create_jump_keys="true"
-		     width="118">
-			<menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
-		     label="Public Issue Tracker..." left="0" mouse_opaque="true"
-		     name="Public Issue Tracker..." width="166">
-			<on_click function="PromptShowURL"
-			     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
+		<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator7" width="250" />
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="109" label="Bug Reporting" left="0" mouse_opaque="false"
+		     name="Bug Reporting" opaque="true" tear_off="true" width="118">
+			<menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker..."
+			     left="0" mouse_opaque="true" name="Public Issue Tracker..." width="166">
+				<on_click function="PromptShowURL"
+				     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
 			</menu_item_call>
-			<menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
-		     label="Public Issue Tracker Help..." left="0" mouse_opaque="true"
-		     name="Publc Issue Tracker Help..." width="166">
-			<on_click function="PromptShowURL"
-			     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
+			<menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker Help..."
+			     left="0" mouse_opaque="true" name="Publc Issue Tracker Help..." width="166">
+				<on_click function="PromptShowURL"
+				     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
 			</menu_item_call>
-			<menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
-			left="0" mouse_opaque="true" name="separator7" width="250" />
-			<menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
-		     label="Bug Reporting 101..." left="0" mouse_opaque="true"
-		     name="Bug Reporing 101..." width="166">
-			<on_click function="PromptShowURL"
-			     userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+			<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator7" width="250" />
+			<menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
+			     mouse_opaque="true" name="Bug Reporing 101..." width="166">
+				<on_click function="PromptShowURL"
+				     userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
 			</menu_item_call>
-			<menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
-		     label="Security Issues..." left="0" mouse_opaque="true"
-		     name="Security Issues..." width="166">
-			<on_click function="PromptShowURL"
-			     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
+			<menu_item_call bottom="-94" enabled="true" height="19" label="Security Issues..." left="0"
+			     mouse_opaque="true" name="Security Issues..." width="166">
+				<on_click function="PromptShowURL"
+				     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
 			</menu_item_call>
-			<menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
-		     label="QA Wiki..." left="0" mouse_opaque="true"
-		     name="QA Wiki..." width="166">
-			<on_click function="PromptShowURL"
-			     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
+			<menu_item_call bottom="-94" enabled="true" height="19" label="QA Wiki..." left="0"
+			     mouse_opaque="true" name="QA Wiki..." width="166">
+				<on_click function="PromptShowURL"
+				     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
 			</menu_item_call>
-			<menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
-			left="0" mouse_opaque="true" name="separator7" width="250" />
-			<menu_item_call bottom="-240" enabled="true" height="19" hidden="false" label="Report Bug..."
-		    left="0" mouse_opaque="true" name="Report Bug..." width="166">
-			<on_click function="PromptShowURL" userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
+			<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator72" width="250" />
+			<menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
+			     mouse_opaque="true" name="Report Bug..." width="166">
+				<on_click function="PromptShowURL"
+				     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
 			</menu_item_call>
 		</menu>
 	</menu>
-	<menu bottom="219" drop_shadow="true" enabled="true" height="317"
-	     hidden="false" label="Help" left="227" mouse_opaque="false" name="Help"
-	     opaque="true" tear_off="true" create_jump_keys="true" width="166">
-		<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Second Life Help"
-		     left="0" mouse_opaque="true" name="Second Life Help" shortcut="F1"
-		     width="166">
+	<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="317" label="Help" left="227" mouse_opaque="false" name="Help"
+	     opaque="true" tear_off="true" width="166">
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
+		     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
 			<on_click function="ShowFloater" userdata="help f1" />
 		</menu_item_call>
-		<menu_item_call bottom="-48" enabled="true" height="19" hidden="false" label="In-World Help"
-		     left="0" mouse_opaque="true" name="In-World Help" 
-		     width="166">
-			<on_click function="ShowFloater" userdata="help in-world" />
-		</menu_item_call>
-		<menu_item_call bottom="-48" enabled="true" height="19" hidden="false" label="Additional Help"
-		     left="0" mouse_opaque="true" name="Additional Help" 
-		     width="166">
-			<on_click function="ShowFloater" userdata="help additional" />
-		</menu_item_call>
-		<menu_item_separator bottom="-75" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator" width="166" />
-		<menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
-		     label="Official Linden Blog..." left="0" mouse_opaque="true"
-		     name="Official Linden Blog..." width="166">
+		<menu_item_separator bottom="-75" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator" width="166" />
+		<menu_item_call bottom="-94" enabled="true" height="19" label="Official Linden Blog..."
+		     left="0" mouse_opaque="true" name="Official Linden Blog..." width="166">
 			<on_click function="PromptShowURL"
 			     userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" />
 		</menu_item_call>
-		<menu_item_separator bottom="-102" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator2" width="166" />
-		<menu_item_call bottom="-121" enabled="true" height="19" hidden="false"
-		     label="Scripting Guide..." left="0" mouse_opaque="true"
-		     name="Scripting Guide..." width="166">
+		<menu_item_separator bottom="-102" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator2" width="166" />
+		<menu_item_call bottom="-121" enabled="true" height="19" label="Scripting Guide..." left="0"
+		     mouse_opaque="true" name="Scripting Guide..." width="166">
 			<on_click function="PromptShowFile" userdata="WebLaunchLSLGuide,lsl_guide.html" />
 		</menu_item_call>
-		<menu_item_call bottom="-140" enabled="true" height="19" hidden="false"
-		     label="Scripting Portal..." left="0" mouse_opaque="true"
-		     name="Scripting Portal..." width="166">
+		<menu_item_call bottom="-140" enabled="true" height="19" label="Scripting Portal..." left="0"
+		     mouse_opaque="true" name="Scripting Portal..." width="166">
 			<on_click function="PromptShowURL"
 			     userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
 		</menu_item_call>
-		<menu_item_separator bottom="-148" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator3" width="166" />
-		<menu_item_call bottom="-167" enabled="true" height="19" hidden="false"
-		     label="Message of the Day..." left="0" mouse_opaque="true"
-		     name="Message of the Day..." width="166">
+		<menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator3" width="166" />
+		<menu_item_call bottom="-167" enabled="true" height="19" label="Message of the Day..." left="0"
+		     mouse_opaque="true" name="Message of the Day..." width="166">
 			<on_click function="Help.MOTD" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-175" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator4" width="166" />
-		<menu_item_call bottom="-194" enabled="true" height="19" hidden="false" label="Report Abuse..."
-		     left="0" mouse_opaque="true" name="Report Abuse..." width="166">
+		<menu_item_separator bottom="-175" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator4" width="166" />
+		<menu_item_call bottom="-194" enabled="true" height="19" label="Report Abuse..." left="0"
+		     mouse_opaque="true" name="Report Abuse..." width="166">
 			<on_click function="ShowFloater" userdata="complaint reporter" />
 		</menu_item_call>
-		<menu_item_call bottom="-213" enabled="true" height="19" hidden="false"
-		     label="Bumps, Pushes &amp; Hits..." left="0" mouse_opaque="true"
-		     name="Bumps, Pushes &amp;amp; Hits..." width="166">
+		<menu_item_call bottom="-213" enabled="true" height="19" label="Bumps, Pushes &amp; Hits..."
+		     left="0" mouse_opaque="true" name="Bumps, Pushes &amp;amp; Hits..."
+		     width="166">
 			<on_click function="ShowFloater" userdata="mean events" />
 		</menu_item_call>
 		<menu_item_call label="Lag Meter" name="Lag Meter">
 			<on_click function="ShowFloater" userdata="lag meter" />
 		</menu_item_call>
-		<menu_item_separator bottom="-221" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator5" width="166" />
-		<menu_item_call bottom="-121" enabled="true" height="19" hidden="false"
-		     label="Release Notes..." left="0" mouse_opaque="true"
-		     name="Release Notes..." width="166">
+		<menu_item_separator bottom="-221" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator5" width="166" />
+		<menu_item_call bottom="-121" enabled="true" height="19" label="Release Notes..." left="0"
+		     mouse_opaque="true" name="Release Notes..." width="166">
 			<on_click function="PromptShowFile" userdata="WebLaunchReleaseNotes,releasenotes.txt" />
 		</menu_item_call>
-		<menu_item_separator bottom="-294" enabled="true" height="8" hidden="false" label="-----------"
-		     left="0" mouse_opaque="true" name="separator6" width="166" />
-		<menu_item_call bottom="-313" enabled="true" height="19" hidden="false"
-		     label="About Second Life..." left="0" mouse_opaque="true"
-		     name="About Second Life..." width="166">
+		<menu_item_separator bottom="-294" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator6" width="166" />
+		<menu_item_call bottom="-313" enabled="true" height="19" label="About Second Life..." left="0"
+		     mouse_opaque="true" name="About Second Life..." width="166">
 			<on_click function="ShowFloater" userdata="about" />
 		</menu_item_call>
 	</menu>
diff --git a/linden/indra/newview/skins/xui/en-us/mime_types.xml b/linden/indra/newview/skins/xui/en-us/mime_types.xml
new file mode 100644
index 0000000..0427727
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/mime_types.xml
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes>
+	<defaultlabel>
+		(Unknown)
+	</defaultlabel>
+	<defaultwidget>
+		none
+	</defaultwidget>
+	<defaultimpl>
+		LLMediaImplLLMozLib
+	</defaultimpl>
+	<widgetset name="web">
+		<label>
+			Web Content
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			text/html
+		</default_type>
+		<tooltip>
+			This location has Web content
+		</tooltip>
+		<playtip>
+			Show Web content
+		</playtip>
+		<allow_resize>
+			true
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="movie">
+		<label>
+			Movie
+		</label>
+		<default_type>
+			video/*
+		</default_type>
+		<icon>
+			icn_media.tga
+		</icon>
+		<tooltip>
+			There is a movie to play here
+		</tooltip>
+		<playtip>
+			Play movie
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			true
+		</allow_looping>
+	</widgetset>
+	<widgetset name="none">
+		<label>
+			No Content
+		</label>
+		<default_type>
+			none/none
+		</default_type>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<tooltip>
+			No media here
+		</tooltip>
+		<playtip />
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="image">
+		<label>
+			Image
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			image/*
+		</default_type>
+		<tooltip>
+			There is an image at this location
+		</tooltip>
+		<playtip>
+			View this location&apos;s image
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="audio">
+		<label>
+			Audio
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			audio/*
+		</default_type>
+		<tooltip>
+			There is audio at this location
+		</tooltip>
+		<playtip>
+			View this location&apos;s audio
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			true
+		</allow_looping>
+	</widgetset>
+	<scheme name="rtsp">
+		<label>
+			Real Time Streaming
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+	</scheme>
+	<mimetype name="">
+		<label>
+			- None -
+		</label>
+		<widgettype>
+			none
+		</widgettype>
+		<impl>
+			LLMediaImplQuickTime
+		</impl>
+	</mimetype>
+	<mimetype name="none/none">
+		<label>
+			- None -
+		</label>
+		<widgettype>
+			none
+		</widgettype>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label>
+			Audio
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+	</mimetype>
+	<mimetype name="video/*">
+		<label>
+			Video
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+	</mimetype>
+	<mimetype name="image/*">
+		<label>
+			Image
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+		<label>
+			Movie (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			LLMediaImplQuickTime
+		</impl>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label>
+			Javascript
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label>
+			Ogg Audio/Video
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label>
+			PDF Document
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label>
+			Postscript Document
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label>
+			Rich Text (RTF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label>
+			Web Page (XHTML)
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label>
+			Macromedia Director
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/x-shockwave-flash">
+		<label>
+			Flash
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label>
+			Audio (MIDI)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label>
+			Audio (MP3)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label>
+			Audio (AIFF)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label>
+			Audio (WAV)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+	</mimetype>
+	<mimetype menu="1" name="image/bmp">
+		<label>
+			Image (BMP)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			LLMediaImplLLMozLib
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/gif">
+		<label>
+			Image (GIF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			LLMediaImplLLMozLib
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/jpeg">
+		<label>
+			Image (JPEG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			LLMediaImplLLMozLib
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/png">
+		<label>
+			Image (PNG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			LLMediaImplLLMozLib
+		</impl>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label>
+			Image (SVG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			LLMediaImplLLMozLib
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/tiff">
+		<label>
+			Image (TIFF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			LLMediaImplLLMozLib
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="text/html">
+		<label>
+			Web Page
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+			LLMediaImplLLMozLib
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="text/plain">
+		<label>
+			Text
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			LLMediaImplLLMozLib
+		</impl>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label>
+			XML
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			LLMediaImplLLMozLib
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/mpeg">
+		<label>
+			Movie (MPEG)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			LLMediaImplQuickTime
+		</impl>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label>
+			Movie (MP4)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			LLMediaImplQuickTime
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/quicktime">
+		<label>
+			Movie (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			LLMediaImplQuickTime
+		</impl>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label>
+			Movie (Windows Media ASF)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			LLMediaImplQuickTime
+		</impl>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label>
+			Movie (Windows Media WMV)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			LLMediaImplQuickTime
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/x-msvideo">
+		<label>
+			Movie (AVI)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			LLMediaImplQuickTime
+		</impl>
+	</mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index d1964e0..f0ba148 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -120,6 +120,11 @@ you will probably want to turn it off.
 			Insufficient permissions to view notecard.
 		</message>
 	</notify>
+	<notify name="RezItemNoPermissions" tip="true">
+		<message name="message">
+			Insufficient permissions to rez object.
+		</message>
+	</notify>
 	<notify name="UnableToLoadNotecard" tip="true">
 		<message name="message">
 			Unable to load notecard.
@@ -651,7 +656,7 @@ Please notify the vendor from whom you purchased this item.
 			Failed to find [TYPE] named [DESC] in database.
 		</message>
 	</notify>
-	<notify name="ScriptTakeMoney" tip="false" caution="true">
+	<notify caution="true" name="ScriptTakeMoney" tip="false">
 		<message name="message">
 			Take Linden dollars (L$) from you
 		</message>
@@ -706,7 +711,6 @@ Please notify the vendor from whom you purchased this item.
 			Control your camera
 		</message>
 	</notify>
-  <!-- the normal permissions prompt -->
 	<notify name="ScriptQuestion" tip="false">
 		<message name="message">
 			&apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
@@ -724,39 +728,41 @@ Is this OK?
 			Mute
 		</option>
 	</notify>
-  <!-- the special chat messages to log when caution permissions have been granted or denied -->
-  <notify name="ScriptQuestionCautionChatGranted" tip="false">
-    <message name="message">&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</message>
-  </notify>
-  <notify name="ScriptQuestionCautionChatDenied" tip="false">
-    <message name="message">&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</message>
-  </notify>
-  <!-- the special title to display at the top of a caution permissions prompt -->
-  <notify name="ScriptQuestionCautionWarn" tip="false">
-    <message name="message">An object wants permission to take Linden dollars (L$) from your account.</message>
-  </notify>
-  <!-- the caution permssions prompt, when auto-deny is disabled -->
-  <notify name="ScriptQuestionCaution" tip="false" caution="true">
-    <message name="message">
-      &apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+	<notify name="ScriptQuestionCautionChatGranted" tip="false">
+		<message name="message">
+			&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].
+		</message>
+	</notify>
+	<notify name="ScriptQuestionCautionChatDenied" tip="false">
+		<message name="message">
+			&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].
+		</message>
+	</notify>
+	<notify name="ScriptQuestionCautionWarn" tip="false">
+		<message name="message">
+			An object wants permission to take Linden dollars (L$) from your account.
+		</message>
+	</notify>
+	<notify caution="true" name="ScriptQuestionCaution" tip="false">
+		<message name="message">
+			&apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
  
 [QUESTIONS]
 If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button.
 
 Grant this request?
-    </message>
-    <option name="Grant">
-      Grant
-    </option>
-    <option name="Deny" default="true">
-      Deny
-    </option>
-    <!-- details button MUST be the last button -->
-    <option name="Details">
-      Details...
-    </option>
-  </notify>
-  <notify name="ScriptDialog" tip="false">
+		</message>
+		<option name="Grant">
+			Grant
+		</option>
+		<option default="true" name="Deny">
+			Deny
+		</option>
+		<option name="Details">
+			Details...
+		</option>
+	</notify>
+	<notify name="ScriptDialog" tip="false">
 		<message name="message">
 			[FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
@@ -870,16 +876,21 @@ until the flexible checkbox is unchecked.
 	</notify>
 	<notify name="FirstDebugMenus" tip="false">
 		<message name="message">
-			You have enabled the Client and Server debugging menus. 
-These menus contain features useful for developers debugging Second Life.
-To toggle these menus on and off press Ctrl-Alt-D. On a Mac press Cmd-Opt-Shift-D.
+			You have enabled the Advanced menu. 
+This menu contains features useful for developers debugging Second Life.
+To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D.
 		</message>
 	</notify>
 	<notify name="FirstSculptedPrim" tip="false">
 		<message name="message">
-		    You are editing a sculpted prim.  
+			You are editing a sculpted prim.  
 Sculpted prims require a special texture to specify their shape.  
-You can find example sculpted textures in the system library.
+You can find example sculpted textures in the inventory library.
+		</message>
+	</notify>
+	<notify name="FirstMedia" tip="false">
+		<message name="message">
+			You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
 		</message>
 	</notify>
 	<notify name="MaxListSelectMessage" tip="true">
@@ -955,7 +966,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t
 	</notify>
 	<notify name="ProximalVoiceChannelFull" tip="true" unique="true">
 		<message name="message">
-			We're sorry.  This area has has reached maximum capacity for voice conversations.  Please try to use voice in another area.
+			We&apos;re sorry.  This area has has reached maximum capacity for voice conversations.  Please try to use voice in another area.
 		</message>
 	</notify>
 	<notify name="VoiceChannelDisconnected" tip="true" unique="true">
@@ -978,13 +989,12 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t
 			[VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
 		</message>
 	</notify>
-
 	<notify name="VoiceChannelJoinFailed" tip="true" unique="true">
 		<message name="message">
 			Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to spatial voice chat.
 		</message>
 	</notify>
-	<notify name="VoiceLoginRetry" tip="true" unique="true" duration="10">
+	<notify duration="10" name="VoiceLoginRetry" tip="true" unique="true">
 		<message name="message">
 			We are creating a voice channel for you. This may take up to one minute.
 		</message>
@@ -1005,18 +1015,18 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t
 		</message>
 	</notify>
 	<notify name="VoiceNotAllowed" tip="true" unique="true">
-	  <message name="message">
-	    You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
-	  </message>
+		<message name="message">
+			You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
+		</message>
 	</notify>
 	<notify name="VoiceCallGenericError" tip="true" unique="true">
-	  <message name="message">
-	    An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
-	  </message>
+		<message name="message">
+			An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
+		</message>
 	</notify>
-	<notify name="ServerVersionChanged" tip="true" caution="true" duration="10">
+	<notify caution="true" duration="10" name="ServerVersionChanged" tip="true">
 		<message name="message">
-		  "The region you have entered is running a different simulator version. Click this message for details."
+			The region you have entered is running a different simulator version. Click this message for details.
 		</message>
 	</notify>
 </notifications>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
index ead0846..13200e8 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" follows="left|top|right|bottom" height="160"
      label="Audio &amp; Video" name="Media panel" width="175">
 	<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="left|top|right"
 	     height="15" increment="0.05" initial_val="0.5" label="Master"
 	     label_width="55" left="10" max_val="1" min_val="0" mouse_opaque="true"
-	     name="System Volume" show_text="false" volume="true" width="140" />
+	     name="System Volume" show_text="false" volume="true" width="200" />
 	<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
-	     left="150" name="mute_music" tab_stop="false" toggle="true" width="25" />
+	     left="150" name="mute_audio" tab_stop="false" toggle="true" width="25" />
 	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="left|top|right"
 	     height="15" increment="0.05" initial_val="0.5" label="Music"
 	     label_width="55" left="10" max_val="1" min_val="0" name="Music Volume"
-	     show_text="false" volume="true" width="140" />
+	     show_text="false" volume="true" width="200" />
 	<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -20,7 +20,7 @@
 	<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="left|top|right"
 	     height="15" increment="0.05" initial_val="0.5" label="Media"
 	     label_width="55" left="10" max_val="1" min_val="0" name="Media Volume"
-	     show_text="false" volume="true" width="140" />
+	     show_text="false" volume="true" width="200" />
 	<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -28,7 +28,7 @@
 	<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="left|top|right"
 	     height="15" increment="0.05" initial_val="0.5" label="Voice"
 	     label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume"
-	     show_text="false" volume="true" width="140" />
+	     show_text="false" volume="true" width="200" />
 	<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -36,7 +36,7 @@
 	<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="left|top|right"
 	     height="15" increment="0.05" initial_val="0.5" label="Sounds"
 	     label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume"
-	     show_text="false" volume="true" width="140" />
+	     show_text="false" volume="true" width="200" />
 	<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -44,7 +44,7 @@
 	<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="left|top|right"
 	     height="15" increment="0.05" initial_val="0.5" label="Ambient"
 	     label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume"
-	     show_text="false" volume="true" width="140" />
+	     show_text="false" volume="true" width="200" />
 	<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -52,7 +52,7 @@
 	<slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
 	     height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55"
 	     left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
-	     volume="true" width="140" />
+	     volume="true" width="200" />
 	<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml b/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
index 08d1cf4..39820e5 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
@@ -1,83 +1,60 @@
-	<panel 
-		border="false" 
-		enabled="true" 
-		hidden="false" 
-		left="8" 
-		bottom="0"
-		mouse_opaque="true" 
-		name="device_settings" 
-		width="404"
-		height="240">
-
-		<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			 drop_shadow_visible="true" enabled="true" follows="left|top"
-			 font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			 left="6" mouse_opaque="true" name="Input device (microphone):" v_pad="0" width="200">
-			Audio Devices
-		</text>
-
-		<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			 bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
-			 font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			 left="20" mouse_opaque="true" name="Input device (microphone):" v_pad="0" width="200">
-			Input device (microphone):
-		</text>
-		<combo_box allow_text_entry="false" bottom_delta="-20" enabled="true" follows="left|top"
-			 height="18" hidden="false" left_delta="0" max_chars="128" mouse_opaque="true"
-			 name="voice_input_device" width="225" />
-
-		<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			 bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-			 font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			 left_delta="0" mouse_opaque="true" name="Output device (speakers):" v_pad="0" width="200">
-			Output device (speakers):
-		</text>
-		<combo_box allow_text_entry="false" bottom_delta="-20" enabled="true" follows="left|top"
-			 height="18" hidden="false" left_delta="0" max_chars="128" mouse_opaque="true"
-			 name="voice_output_device" width="225" />
-
-		<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			 bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-			 font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-			 left="6" mouse_opaque="true" name="Input device (microphone):" v_pad="0" width="200">
-			Input Level
-		</text>
-
-		<text_editor 
-			name="voice_intro_text1" 
-			type="string" 
-			enabled="false" 
-			bg_readonly_color="0 0 0 0" 
-			font="SansSerifSmall" 
-			left_delta="10" 
-			width="380" 
-			height="60" 
-			length="1" 
-			max_length="65535"
-			hidden="false" 
-			hide_border="true"
-			hide_scrollbar="true" 
-			embedded_items="false" 
-			allow_html="false" 
-			mouse_opaque="true" 
-			tab_stop="false"
-			word_wrap="true">Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone.</text_editor>
-
-	<volume_slider bottom_delta="-18" enabled="true" follows="left|top" height="17" hidden="false"
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" bottom="0" enabled="true" height="240" left="8"
+     mouse_opaque="true" name="device_settings" width="404">
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="6"
+	     mouse_opaque="true" name="Audio Devices" v_pad="0" width="200">
+		Audio Devices
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-22" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="16" left="20" mouse_opaque="true" name="Input device (microphone):"
+	     v_pad="0" width="200">
+		Input device (microphone):
+	</text>
+	<combo_box allow_text_entry="false" bottom_delta="-20" enabled="true" follows="left|top"
+	     height="18" left_delta="0" max_chars="128" mouse_opaque="true"
+	     name="voice_input_device" width="225" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="16" left_delta="0" mouse_opaque="true"
+	     name="Output device (speakers):" v_pad="0" width="200">
+		Output device (speakers):
+	</text>
+	<combo_box allow_text_entry="false" bottom_delta="-20" enabled="true" follows="left|top"
+	     height="18" left_delta="0" max_chars="128" mouse_opaque="true"
+	     name="voice_output_device" width="225" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-30" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="16" left="6" mouse_opaque="true" name="Input level:" v_pad="0"
+	     width="200">
+		Input Level
+	</text>
+	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
+	     enabled="false" font="SansSerifSmall" height="60" hide_border="true"
+	     hide_scrollbar="true" left_delta="10" max_length="65535"
+	     mouse_opaque="true" name="voice_intro_text1" tab_stop="false" width="380"
+	     word_wrap="true">
+		Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone.
+	</text_editor>
+	<volume_slider bottom_delta="-18" enabled="true" follows="left|top" height="17"
 	     increment="0.05" initial_val="0.5" left_delta="5" max_val="1" min_val="0"
-	     mouse_opaque="true" name="mic_volume_slider" width="90"
-	     tool_tip="Change the volume using this slider" />
-
-	<text name="wait_text" left_delta="95" bottom_delta="-4" width="200" height="20" follows="left|top">
+	     mouse_opaque="true" name="mic_volume_slider"
+	     tool_tip="Change the volume using this slider" width="90" />
+	<text bottom_delta="-4" follows="left|top" height="20" left_delta="95"
+	     name="wait_text" width="200">
 		Please wait
 	</text>
-	<locate name="bar0" left_delta="0" width="20" bottom_delta="-5" height="20"/>
-	<locate name="bar1" left_delta="22" width="20" bottom_delta="0" height="20"/>
-	<locate name="bar2" left_delta="22" width="20" bottom_delta="0" height="20"/>
-	<locate name="bar3" left_delta="22" width="20" bottom_delta="0" height="20"/>
-	<locate name="bar4" left_delta="22" width="20" bottom_delta="0" height="20"/>
-	<!--<icon name="voice_volume" left_delta="70" bottom_delta="1" width="16" height="16" image_name="icn_voice_ptt-off.tga"  follows="left|top"/>-->
-
-	<text hidden="true" name="default_text">"Default"</text>
-
-	</panel>
+	<locate bottom_delta="-5" height="20" left_delta="0" name="bar0" width="20" />
+	<locate bottom_delta="0" height="20" left_delta="22" name="bar1" width="20" />
+	<locate bottom_delta="0" height="20" left_delta="22" name="bar2" width="20" />
+	<locate bottom_delta="0" height="20" left_delta="22" name="bar3" width="20" />
+	<locate bottom_delta="0" height="20" left_delta="22" name="bar4" width="20" />
+	<string name="default_text">
+		Default
+	</string>
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index f36a380..53d25c0 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -1,40 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430">
 	<tab_container bottom="-486" height="486" left="0" mouse_opaque="false" name="tab"
 	     tab_min_width="50" tab_position="top" width="420">
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
 		     label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418">
-			<text hidden="true" name="CaptionTextAcctInfo">
+			<string name="CaptionTextAcctInfo">
 				[ACCTTYPE]
 [PAYMENTINFO]
 [AGEVERIFICATION]
-			</text>
-			<text hidden="true" name="AcctTypeResident">
+			</string>
+			<string name="AcctTypeResident">
 				Resident
-			</text>
-			<text hidden="true" name="AcctTypeTrial">
+			</string>
+			<string name="AcctTypeTrial">
 				Trial
-			</text>
-			<text hidden="true" name="AcctTypeCharterMember">
+			</string>
+			<string name="AcctTypeCharterMember">
 				Charter Member
-			</text>
-			<text hidden="true" name="AcctTypeEmployee">
+			</string>
+			<string name="AcctTypeEmployee">
 				Linden Lab Employee
-			</text>
-			<text hidden="true" name="PaymentInfoUsed">
+			</string>
+			<string name="PaymentInfoUsed">
 				Payment Info Used
-			</text>
-			<text hidden="true" name="PaymentInfoOnFile">
+			</string>
+			<string name="PaymentInfoOnFile">
 				Payment Info On File
-			</text>
-			<text hidden="true" name="NoPaymentInfoOnFile">
+			</string>
+			<string name="NoPaymentInfoOnFile">
 				No Payment Info On File
-			</text>
-			<text hidden="true" name="AgeVerified">
+			</string>
+			<string name="AgeVerified">
 				Age-verified
-			</text>
-			<text hidden="true" name="NotAgeVerified">
+			</string>
+			<string name="NotAgeVerified">
 				Not Age-verified
-			</text>
+			</string>
 			<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="right" height="16" left="4"
@@ -75,7 +76,6 @@
 			     border_visible="true" bottom_delta="0" drop_shadow_visible="true"
 			     follows="left|top" font="SansSerifSmall" height="48" left="279"
 			     mouse_opaque="false" name="acct" text_color="1, 1, 1, 1" width="121" />
-
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
@@ -84,9 +84,10 @@
 			     v_pad="0" width="130">
 				Partner:
 			</text>
- 			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
 			     height="18" label="i" label_selected="i" left_delta="44"
-			     mouse_opaque="true" name="partner_info" tool_tip="Click to open partner's profile" width="18" />
+			     mouse_opaque="true" name="partner_info"
+			     tool_tip="Click to open partner&apos;s profile" width="18" />
 			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
 			     height="18" label="?" label_selected="?" left_delta="24"
 			     mouse_opaque="true" name="partner_help" width="18" />
@@ -155,9 +156,10 @@
 				Drop inventory item here.
 			</text>
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Show in search" left="75"
-			     mouse_opaque="true" name="allow_publish"
-			     tool_tip="Publish extra profile information such as description and image in Search." width="130" />
+			     initial_value="false" label="Show in search" left="75" mouse_opaque="true"
+			     name="allow_publish"
+			     tool_tip="Publish extra profile information such as description and image in Search."
+			     width="130" />
 			<button bottom="-423" follows="left|top" font="SansSerif" halign="center" height="16"
 			     label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"
 			     width="20" />
@@ -167,16 +169,16 @@
 			<button bottom="-428" font="SansSerif" halign="center" height="20"
 			     label="Offer Teleport..." label_selected="Offer Teleport..."
 			     left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />
-			<button bottom="-428" font="SansSerif" halign="center" height="20" label="Add Friend..."
-			     label_selected="Add Friend..." left_delta="142" mouse_opaque="true"
-			     name="Add Friend..." width="130" />
+			<button bottom="-428" font="SansSerif" halign="center" height="20"
+			     label="Add Friend..." label_selected="Add Friend..." left_delta="142"
+			     mouse_opaque="true" name="Add Friend..." width="130" />
 			<button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Pay..."
 			     label_selected="Pay..." left="24" mouse_opaque="true" name="Pay..."
 			     width="100" />
 			<button bottom_delta="0" font="SansSerif" halign="center" height="20"
 			     label="Instant Message..." label_selected="Instant Message..."
-			     left_delta="102" mouse_opaque="true" name="Instant Message..." width="140" 
-			     tool_tip="Instant Message (IM)"/>
+			     left_delta="102" mouse_opaque="true" name="Instant Message..."
+			     tool_tip="Instant Message (IM)" width="140" />
 			<button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Mute"
 			     label_selected="Mute" left_delta="142" mouse_opaque="true" name="Mute"
 			     width="130" />
@@ -184,8 +186,8 @@
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
 		     label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
 			<button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="18" label="Home" label_selected="Home" left="10" mouse_opaque="true"
-			     name="home" width="55" />
+			     height="18" label="Home" label_selected="Home" left="10"
+			     mouse_opaque="true" name="home" width="55" />
 			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
 			     height="18" label="Load" label_selected="Load" left_delta="0"
 			     mouse_opaque="true" name="load"
@@ -212,8 +214,7 @@
 			     ignore_ui_scale="false" left="10" name="profile_html" start_url=""
 			     width="400" />
 			<text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
-			     top="25">
-			</text>
+			     top="25" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
 		     label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
@@ -268,8 +269,8 @@
 			     initial_value="false" label="Event Planning" left_delta="0"
 			     mouse_opaque="true" name="schk2" width="105" />
 			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Modeling" left_delta="-170" mouse_opaque="true"
-			     name="schk3" width="90" />
+			     initial_value="false" label="Modeling" left_delta="-170"
+			     mouse_opaque="true" name="schk3" width="90" />
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
 			     initial_value="false" label="Scripting" left_delta="0" mouse_opaque="true"
 			     name="schk4" width="90" />
@@ -312,10 +313,10 @@
 			<tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"
 			     name="picks tab" tab_position="left" width="412" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-70" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerif" h_pad="0" halign="left" height="20" left="114"
-			     mouse_opaque="false" name="loading_text" v_pad="0" width="302">
-			     Loading...
+			     bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
+			     name="loading_text" v_pad="0" width="302">
+				Loading...
 			</text>
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
@@ -338,10 +339,10 @@
 			<tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false"
 			     name="classified tab" tab_position="left" width="412" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-70" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerif" h_pad="0" halign="left" height="20" left="114"
-			     mouse_opaque="false" name="loading_text" v_pad="0" width="302">
-			     Loading...
+			     bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
+			     name="loading_text" v_pad="0" width="302">
+				Loading...
 			</text>
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
@@ -375,6 +376,9 @@
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
 		     label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
+			<string name="Loading">
+				Loading...
+			</string>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-52" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="48" left="10"
@@ -405,27 +409,29 @@ notes.  This person cannot see them, nor can other people.
 	<button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="CSR"
 	     label_selected="CSR" left="4" mouse_opaque="true" name="csr_btn"
 	     tool_tip="Open customer service tool for this resident" width="72" />
-	<text hidden="true" name="ShowOnMapNonFriend">
+	<string name="ShowOnMapNonFriend">
 		Show location on the map.
 Disabled because you have not
 formed a friendship with them.
-	</text>
-	<text hidden="true" name="ShowOnMapFriendOffline">
+	</string>
+	<string name="ShowOnMapFriendOffline">
 		Show location on the map.
-Disabled because they are not online.
-	</text>
-	<text hidden="true" name="ShowOnMapFriendOnline">
+    Disabled because they are not online.
+	</string>
+	<string name="ShowOnMapFriendOnline">
 		Show location on the map.
-	</text>
-	<text hidden="true" name="TeleportGod">
+	</string>
+	<string name="TeleportGod">
 		Force a teleport to your location.
-	</text>
-	<text hidden="true" name="TeleportPrelude">
+	</string>
+	<string name="TeleportPrelude">
 		Offer a teleport to your location.
 Disabled until you leave Orientation Island.
-	</text>
-	<text hidden="true" name="TeleportNormal">
+	</string>
+	<string name="TeleportNormal">
 		Offer a teleport to your location.
-	</text>
-	<text hidden="true" name="Loading">Loading...</text>
+	</string>
+	<string name="Loading">
+		Loading...
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
index bf0f15b..7cc1a60 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
@@ -45,9 +45,13 @@
 	<check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="20" label="Auto-renew each week" left="10" name="auto_renew_check"
 	     width="120" />
-	<text hidden="true" name="ad_placed_paid">
+	<string name="ad_placed_paid">
 		Ad placed: [DATE], Paid L$[AMT] for listing.
-	</text>
-	<text name="update_txt" hidden="true">Update</text>
-	<text name="publish_txt" hidden="true">Publish...</text>
+	</string>
+	<string name="update_txt">
+		Update
+	</string>
+	<string name="publish_txt">
+		Publish...
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bars.xml b/linden/indra/newview/skins/xui/en-us/panel_bars.xml
index 93db538..d8cb4d0 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_bars.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_bars.xml
@@ -1,11 +1,21 @@
-<panel enabled="true" follows="left|right|top|bottom" mouse_opaque="false" height="768" left="0"
-     name="bottom_panel" width="1024">
-	<panel name="status" left="0" bottom="040" height="728" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>
-     <layout_stack name="bar_stack" left="0" bottom="0" height="768" width="1024" 
-			follows="left|right|bottom|top" mouse_opaque="false" orientation="vertical" border_size="0" use_bounding_rect="true">
-		  <layout_panel name="spacer" left="0" bottom="0" height="768" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>
-		  <layout_panel name="overlay" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>
-		  <layout_panel name="toolbar" filename="panel_toolbar.xml" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>
-     </layout_stack>
-	<panel name="hud" left="0" bottom="50" height="728" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel enabled="true" follows="left|right|top|bottom" height="768" left="0"
+     mouse_opaque="false" name="bottom_panel" width="1024">
+	<panel auto_resize="true" background_visible="false" bottom="040"
+	     follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false"
+	     name="status" user_resize="false" width="1024" />
+	<layout_stack border_size="0" bottom="0" follows="left|right|bottom|top" height="768"
+	     left="0" mouse_opaque="false" name="bar_stack" orientation="vertical"
+	     use_bounding_rect="true" width="1024">
+		<layout_panel auto_resize="true" background_visible="false" bottom="0"
+		     follows="left|right|top|bottom" height="768" left="0" mouse_opaque="false"
+		     name="spacer" user_resize="false" width="1024" />
+		<layout_panel auto_resize="false" name="overlay" use_bounding_rect="true" user_resize="false"
+		     width="1024" />
+		<layout_panel auto_resize="false" filename="panel_toolbar.xml" name="toolbar"
+		     use_bounding_rect="true" user_resize="false" width="1024" />
+	</layout_stack>
+	<panel auto_resize="true" background_visible="false" bottom="50"
+	     follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false"
+	     name="hud" user_resize="false" width="1024" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml b/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
index 797fb9e..def7a87 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
@@ -1,12 +1,10 @@
-<panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="20" use_bounding_rect="true"
-     left="0" name="bg_tab" width="100">
-	<icon bottom="-36" color="DefaultShadowDark"
-	     follows="left|right|top|bottom" height="38" image_name="rounded_square.tga"
-	     left="1" width="100" />
-	<icon bottom="-36" color="DefaultHighlightLight"
-	     follows="left|right|top|bottom" height="38" image_name="rounded_square.tga"
-	     left="0" width="98" />
-	<icon bottom="-36" color="FocusBackgroundColor"
-	     follows="left|right|top|bottom" height="37" image_name="rounded_square.tga"
-	     left="1" width="99" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="20"
+     left="0" name="bg_tab" use_bounding_rect="true" width="100">
+	<icon bottom="-36" color="DefaultShadowDark" follows="left|right|top|bottom"
+	     height="38" image_name="rounded_square.tga" left="1" width="100" />
+	<icon bottom="-36" color="DefaultHighlightLight" follows="left|right|top|bottom"
+	     height="38" image_name="rounded_square.tga" left="0" width="98" />
+	<icon bottom="-36" color="FocusBackgroundColor" follows="left|right|top|bottom"
+	     height="37" image_name="rounded_square.tga" left="1" width="99" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
index fd252d4..c4c6c12 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
@@ -1,20 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="0" default_tab_group="1" follows="left|bottom|right" height="23"
      left="0" name="chat_bar" width="395">
-	<panel left="-397" bottom="0" width="397" height="23" follows="left|right|bottom" use_bounding_rect="true">
-		<panel left="0" bottom="0" width="397" height="23" filename="panel_bg_tab.xml"/>
+	<panel bottom="0" follows="left|right|bottom" height="23" left="-397"
+	     use_bounding_rect="true" width="397">
+		<panel bottom="0" filename="panel_bg_tab.xml" height="23" left="0" width="397" />
 	</panel>
 	<button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="22"
 	     label="Local Chat" left="1" name="History"
 	     tool_tip="Click here to see what has been said" width="100" />
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
-	     follows="left|right|bottom" handle_edit_keys_directly="false" height="19" font="SansSerif"
-	     label="Click here to chat." left="107" max_length="254" name="Chat Editor"
+	     follows="left|right|bottom" font="SansSerif"
+	     handle_edit_keys_directly="false" height="19" label="Click here to chat."
+	     left="107" max_length="254" name="Chat Editor"
 	     select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
 	     tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" />
 	<flyout_button bottom="-23" follows="right|bottom" height="22" label="Say" left_delta="110"
-	     mouse_opaque="true" name="Say" tool_tip="(Enter)" width="80" list_position="above">
-		<flyout_button_item value="say">Say</flyout_button_item>
-		<flyout_button_item value="shout">Shout</flyout_button_item>
+	     list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
+	     width="80">
+		<flyout_button_item value="say">
+			Say
+		</flyout_button_item>
+		<flyout_button_item value="shout">
+			Shout
+		</flyout_button_item>
 	</flyout_button>
 	<combo_box allow_text_entry="false" bottom="-22" follows="right|bottom" height="19"
 	     label="Gestures" left_delta="85" max_chars="20" name="Gesture" width="80">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_classified.xml b/linden/indra/newview/skins/xui/en-us/panel_classified.xml
index 4bb4988..5ff802a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_classified.xml
@@ -30,6 +30,13 @@
 	     text_readonly_color="white" />
 	<button bottom="400" follows="left|top" height="20" label="Update" left="30"
 	     name="classified_update_btn" width="70" />
-	<text name="update_txt" hidden="true">Update</text>
-	<text name="publish_txt" hidden="true">Publish...</text>
+	<string name="ad_placed_paid">
+		Ad placed: [DATE], Paid L$[AMT] for listing.
+	</string>
+	<string name="update_txt">
+		Update
+	</string>
+	<string name="publish_txt">
+		Publish...
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_event.xml b/linden/indra/newview/skins/xui/en-us/panel_event.xml
index 9cd58c6..9bb570a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_event.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_event.xml
@@ -83,7 +83,13 @@
 	     name="notify_btn" width="140" />
 	<button bottom_delta="0" follows="left|top" height="20" label="Create Event..."
 	     left="165" name="create_event_btn" width="140" />
-	<text name="none" hidden="true">none</text>
-	<text name="notify" hidden="true">Notify</text>
-	<text name="dont_notify" hidden="true">Don't Notify</text>
+	<string name="none">
+		none
+	</string>
+	<string name="notify">
+		Notify
+	</string>
+	<string name="dont_notify">
+		Don&apos;t Notify
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
index 97779d9..7bb08d2 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
@@ -1,34 +1,43 @@
-<panel name="friends" border="true">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" name="friends">
+	<string name="Multiple">
+		Multiple friends...
+	</string>
 	<scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"
 	     follows="left|top|bottom|right" left="10" multi_select="true"
 	     name="friend_list" right="-100" search_column="1"
 	     tool_tip="Hold shift or control while clicking to select multiple friends"
 	     top="-10">
-		<column image="ff_online_status_button.tga" name="icon_online_status" width="20" tool_tip="Online status"/>
-		<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name"/>
-		<column image="ff_visible_online_button.tga" name="icon_visible_online" width="20" tool_tip="Friend can see when you're online"/>
-		<column image="ff_visible_map_button.tga" name="icon_visible_map" width="20" tool_tip="Friend can locate you on the map"/>
-		<column image="ff_edit_mine_button.tga" name="icon_edit_mine" width="20" tool_tip="Friend can edit your objects"/>
-		<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" width="20" tool_tip="You can edit this friend's objects"/>
-		<column name="friend_last_update_generation" width="0"/>
+		<column image="ff_online_status_button.tga" name="icon_online_status"
+		     tool_tip="Online status" width="20" />
+		<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" />
+		<column image="ff_visible_online_button.tga" name="icon_visible_online"
+		     tool_tip="Friend can see when you&apos;re online" width="20" />
+		<column image="ff_visible_map_button.tga" name="icon_visible_map"
+		     tool_tip="Friend can locate you on the map" width="20" />
+		<column image="ff_edit_mine_button.tga" name="icon_edit_mine"
+		     tool_tip="Friend can edit your objects" width="20" />
+		<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
+		     tool_tip="You can edit this friend&apos;s objects" width="20" />
+		<column name="friend_last_update_generation" width="0" />
 	</scroll_list>
 	<pad bottom="-7" height="0" left="-90" width="1" />
-	<button bottom_delta="-25" follows="top|right" height="22"
-	     label="IM/Call" left_delta="0" name="im_btn"
-	     tool_tip="Open Instant Message session" width="80" />
-	<button bottom_delta="-25" follows="top|right" height="22"
-	     label="Profile" left_delta="0" name="profile_btn"
+	<button bottom_delta="-25" follows="top|right" height="22" label="IM/Call"
+	     left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
+	     width="80" />
+	<button bottom_delta="-25" follows="top|right" height="22" label="Profile"
+	     left_delta="0" name="profile_btn"
 	     tool_tip="Show picture, groups, and other information" width="80" />
-	<button bottom_delta="-25" follows="top|right" height="22"
-	     label="Teleport..." left_delta="0" name="offer_teleport_btn"
+	<button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
+	     left_delta="0" name="offer_teleport_btn"
 	     tool_tip="Offer this friend a teleport to your current location" width="80" />
-	<button bottom_delta="-25" follows="top|right" height="22"
-	     label="Pay..." left_delta="0" name="pay_btn"
+	<button bottom_delta="-25" follows="top|right" height="22" label="Pay..."
+	     left_delta="0" name="pay_btn"
 	     tool_tip="Give Linden dollars (L$) to this friend" width="80" />
-	<button bottom_delta="-25" follows="top|right" height="22"
-	     label="Remove..." left_delta="0" name="remove_btn"
+	<button bottom_delta="-25" follows="top|right" height="22" label="Remove..."
+	     left_delta="0" name="remove_btn"
 	     tool_tip="Remove this person from your friends list" width="80" />
-	<button bottom_delta="-35" follows="top|right" height="22"
-	     label="Add..." left_delta="0" name="add_btn"
-	     tool_tip="Offer friendship to a resident" width="80" />
+	<button bottom_delta="-35" follows="top|right" height="22" label="Add..."
+	     left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
+	     width="80" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group.xml b/linden/indra/newview/skins/xui/en-us/panel_group.xml
index 82214c3..67cdbb8 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group.xml
@@ -2,12 +2,12 @@
 <panel border="false" bottom="0" follows="bottom|left" height="514" left="0"
      left_in_finder="335" mouse_opaque="true" name="GroupInfo" title="GroupInfo"
      width="420">
-	<text name="default_needs_apply_text">
+	<string name="default_needs_apply_text">
 		There are unapplied changes on the current tab.
-	</text>
-	<text name="want_apply_text">
+	</string>
+	<string name="want_apply_text">
 		Do you want to apply these changes?
-	</text>
+	</string>
 	<tab_container border="false" bottom="27" follows="all" height="483" left="0"
 	     name="group_tab_container" tab_position="top" width="420">
 		<panel filename="panel_group_general.xml" name="general_tab" />
@@ -25,7 +25,7 @@
 	<button bottom_delta="0" font="SansSerif" halign="center" height="20" label="OK"
 	     label_selected="OK" left_delta="-96" mouse_opaque="true" name="btn_ok"
 	     width="90" />
-	<button bottom_delta="0" font="SansSerif" halign="center" height="20"
-	     label="Refresh" label_selected="Refresh" left="10"
-	     mouse_opaque="true" name="btn_refresh" width="90" />
+	<button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Refresh"
+	     label_selected="Refresh" left="10" mouse_opaque="true" name="btn_refresh"
+	     width="90" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
index fb1e082..9825cb1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" follows="all" height="466" label="General" left="1"
      mouse_opaque="true" name="general_tab" select="true" width="418">
-	<text name="help_text">
+	<string name="help_text">
 		The General tab contains general information about
 this group, a list of Owners and visible Members, 
 general Group Preferences and member options.
 
 Hover your mouse over the options for more help.
-	</text>
-	<string name="group_info_unchanged">General group information has changed.</string>
+	</string>
+	<string name="group_info_unchanged">
+		General group information has changed.
+	</string>
 	<button bottom="-24" follows="left|top" font="SansSerif" halign="center" height="16"
 	     label="?" label_selected="?" left="391" mouse_opaque="true"
 	     name="help_button" width="20" />
 	<line_editor 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="7" max_length="35"
-	     mouse_opaque="true" name="group_name_editor" prevalidate="ascii" v_pad="0"
-	     width="300" label="Type your new group name here">
-	</line_editor>
+	     h_pad="0" halign="left" height="16" label="Type your new group name here"
+	     left="7" max_length="35" mouse_opaque="true" name="group_name_editor"
+	     prevalidate="ascii" v_pad="0" width="300" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-20" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
@@ -33,10 +34,10 @@ Hover your mouse over the options for more help.
 	     mouse_opaque="true" name="founder_name" v_pad="0" width="200">
 		(waiting)
 	</text>
-	<text bottom_delta="-16" font="SansSerifSmall" halign="left" height="16" right="410"
-	     name="group_charter_label" width="265">
+	<text bottom_delta="-16" font="SansSerifSmall" halign="left" height="16"
+	     name="group_charter_label" right="410" width="265">
 		Group Charter
-                </text>
+	</text>
 	<texture_picker bottom_delta="-129" follows="left|top" height="144"
 	     image_name="icon_groupnotice.tga" label="Group Insignia" left="7"
 	     mouse_opaque="true" name="insignia" tool_tip="Click to choose a picture"
@@ -44,8 +45,8 @@ Hover your mouse over the options for more help.
 	<text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-30" drop_shadow_visible="false" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="160"
-	     hide_scrollbar="true" right="410" max_length="511" mouse_opaque="true"
-	     name="charter" text_readonly_color="0.57647, 0.66275, 0.83529" v_pad="0"
+	     hide_scrollbar="true" max_length="511" mouse_opaque="true" name="charter"
+	     right="410" text_readonly_color="0.57647, 0.66275, 0.83529" v_pad="0"
 	     width="265" word_wrap="true">
 		Group Charter
 	</text_editor>
@@ -55,10 +56,11 @@ Hover your mouse over the options for more help.
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
 	     height="22" label="Detailed View" label_selected="Detailed View"
 	     left_delta="0" mouse_opaque="true" name="info_button" width="128" />
-	<text name="text_owners_and_visible_members" bottom_delta="-16" font="SansSerif">
+	<text bottom_delta="-16" font="SansSerif" name="text_owners_and_visible_members">
 		Owners &amp; Visible Members
 	</text>
-	<text name="text_owners_are_shown_in_bold" bottom_delta="-16" font="SansSerifSmall" left_delta="0" style="bold">
+	<text bottom_delta="-16" font="SansSerifSmall" left_delta="0"
+	     name="text_owners_are_shown_in_bold" style="bold">
 		(Owners are shown in bold)
 	</text>
 	<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-88"
@@ -70,8 +72,7 @@ Hover your mouse over the options for more help.
 		<column label="Title" name="title" relwidth="0.30" />
 		<column label="Last Login" name="online" relwidth="0.25" />
 	</name_list>
-
-	<text name="text_group_preferences" bottom_delta="-18" font="SansSerif">
+	<text bottom_delta="-18" font="SansSerif" name="text_group_preferences">
 		Group Preferences
 	</text>
 	<panel background_opaque="true" background_visible="true" bevel_style="in"
@@ -79,20 +80,19 @@ Hover your mouse over the options for more help.
 	     bottom_delta="-104" follows="left|top" height="96" left_delta="0"
 	     mouse_opaque="true" name="preferences_container" width="404">
 		<check_box bottom="-20" follows="left|top" font="SansSerifSmall" height="16"
-		     initial_value="true" label="Show in search" left="4"
-		     mouse_opaque="true" name="show_in_group_list" radio_style="false"
+		     initial_value="true" label="Show in search" left="4" mouse_opaque="true"
+		     name="show_in_group_list" radio_style="false"
 		     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
-		     tool_tip="Let people see this group in search results."
-		     width="95" />
-<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-		     initial_value="false" label="Mature group" left_delta="0" mouse_opaque="true"
-		     name="mature" radio_style="false"
+		     tool_tip="Let people see this group in search results." width="95" />
+		<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+		     initial_value="false" label="Mature group" left_delta="0"
+		     mouse_opaque="true" name="mature" radio_style="false"
 		     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
 		     tool_tip="Sets whether your group information is considered mature."
 		     visible="true" width="95" />
 		<check_box bottom_delta="-18" follows="right|top" font="SansSerifSmall" height="16"
-		     initial_value="false" label="Open enrollment" left="4"
-		     mouse_opaque="true" name="open_enrollement" radio_style="false"
+		     initial_value="false" label="Open enrollment" left="4" mouse_opaque="true"
+		     name="open_enrollement" radio_style="false"
 		     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
 		     tool_tip="Sets whether this group allows new members to join   without being invited."
 		     width="95" />
@@ -103,24 +103,22 @@ Hover your mouse over the options for more help.
 		     tool_tip="Sets whether to require an enrollment fee to join the group."
 		     width="95" />
 		<spinner bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		     bottom_delta="2" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerif" h_pad="0" halign="left" height="16" increment="1" decimal_digits="0"
-		     label_width="10" left_delta="116" right_delta="170" max_val="99999" min_val="0"
-		     mouse_opaque="true" name="spin_enrollment_fee"
+		     bottom_delta="2" decimal_digits="0" drop_shadow_visible="true"
+		     follows="left|top" font="SansSerif" h_pad="0" halign="left" height="16"
+		     increment="1" label_width="10" left_delta="116" max_val="99999" min_val="0"
+		     mouse_opaque="true" name="spin_enrollment_fee" right_delta="170"
 		     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
 		     tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked."
-		     v_pad="0" width="65"/>
-
-		<panel background_opaque="false" border="false" bottom="-31" height="32"
-		     left="225" name="title_container" width="160">
+		     v_pad="0" width="65" />
+		<panel background_opaque="false" border="false" bottom="-31" height="32" left="225"
+		     name="title_container" width="160">
 			<text bottom="17" font="SansSerifSmall" left="0" name="active_title_label">
 				My Active Title
 			</text>
-			<combo_box bottom_delta="-22" follows="left|top" height="16" left="0" name="active_title"
-			     length="150"
+			<combo_box length="150" bottom_delta="-22" follows="left|top" height="16" left="0" name="active_title"
 			     tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active." />
 		</panel>
-		<check_box follows="left|top" font="SansSerifSmall" height="16" bottom_delta="-25"
+		<check_box bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="16"
 		     initial_value="false" label="Receive group notices" left_delta="0"
 		     mouse_opaque="true" name="receive_notices" radio_style="false"
 		     tool_tip="Sets whether you want to receive Notices from this group.   Uncheck this box if this group is spamming you."
@@ -131,11 +129,12 @@ Hover your mouse over the options for more help.
 		     tool_tip="Sets whether you want to list this group in your Profile"
 		     width="95" />
 	</panel>
-        	<text name="incomplete_member_data_str">
+	<string name="incomplete_member_data_str">
 		Retrieving member data
-	</text>
-	<text name="confirm_group_create_str">
+	</string>
+	<string name="confirm_group_create_str">
 		Creating this group will cost L$100. 
 Are you really, really, REALLY sure you want to spend L$100 to create this group?
-	</text>
+Be aware that if nobody else joins this group within 48 hours, it will be disbanded and the group&apos;s name will be unavailable for future use.
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml b/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
index 1e14fc1..e11c6f6 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
@@ -26,13 +26,11 @@ Person Chooser&apos; to start.
 	     name="role_name"
 	     tool_tip="Choose from the list of Roles you  are allowed to assign members to."
 	     width="196" />
-        <button bottom="4" font="SansSerifSmall" halign="center" height="20"
+	<button bottom="4" font="SansSerifSmall" halign="center" height="20"
 	     label="Send Invitations" left="4" name="ok_button" width="130" />
 	<button bottom_delta="0" font="SansSerifSmall" halign="center" height="20"
 	     label="Cancel" left_delta="132" name="cancel_button" width="70" />
-	<!--button bottom="25" font="SansSerifSmall" halign="center" height="20"
-	     label="Send Invitations" left="65" name="ok_button" width="140" />
-	<button bottom_delta="-22" font="SansSerifSmall" halign="center" height="20"
-	     label="Cancel" left_delta="0" name="cancel_button" width="140" /-->
-	<text hidden="true" name="loading">(loading...)</text>
+	<string name="loading">
+		(loading...)
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
index 8e078c3..f93e9ad 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
@@ -2,21 +2,24 @@
 <panel border="true" bottom="0" follows="all" height="470" label="Land &amp; L$"
      left="1" mouse_opaque="true" name="land_money_tab" select="false"
      width="418">
-	<text name="help_text">
+	<string name="help_text">
 		Parcels owned by the group are listed along with 
 contribution details. A warning appears until the
 Total Land in Use is less than or equal to the Total
 Contribution. The Plannning, Details and Sales tabs
 provide information about the group&apos;s finances.
-	</text>
+	</string>
 	<button bottom="-24" font="SansSerif" halign="center" height="16" label="?" left="391"
 	     name="help_button" width="20" />
-	<text name="cant_view_group_land_text">
+	<string name="cant_view_group_land_text">
 		You do not have permission to view group owned land.
-	</text>
-	<text name="cant_view_group_accounting_text">
+	</string>
+	<string name="cant_view_group_accounting_text">
 		You do not have permission to view the group&apos;s accounting information.
-	</text>
+	</string>
+	<string name="loading_txt">
+		Loading...
+	</string>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-20" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
@@ -85,7 +88,9 @@ provide information about the group&apos;s finances.
 	     left_delta="125" max_length="10" mouse_opaque="true"
 	     name="your_contribution_line_editor" prevalidate="non_negative_s32"
 	     width="70" />
-	<string name="land_contrib_error">Unable to set your land contribution.</string>
+	<string name="land_contrib_error">
+		Unable to set your land contribution.
+	</string>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-2" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="75"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
index 592d458..4e00c66 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" follows="all" height="466" label="Notices" left="1"
      mouse_opaque="true" name="notices_tab" width="418">
-	<text name="help_text">
+	<string name="help_text">
 		Notices are a quick way to communicate across a 
 group by broadcasting a message and delivering 
 an optionally attached item. Notices only go to
 group members in Roles granted the ability to 
 receive Notices. You can turn off Notices on 
 the General tab.
-	</text>
-	<text name="no_notices_text">
+	</string>
+	<string name="no_notices_text">
 		There are no past notices.
-	</text>
+	</string>
 	<button bottom="-24" font="SansSerif" halign="center" height="16" label="?"
 	     label_selected="?" left="391" name="help_button" width="20" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -44,9 +44,9 @@ Click the &apos;Refresh&apos; button to check if new notices have been received.
 	<button bottom_delta="-18" font="SansSerif" halign="center" height="20"
 	     label="Create New Notice" label_selected="Create New Notice" left_delta="0"
 	     mouse_opaque="true" name="create_new_notice" width="150" />
-	<button bottom_delta="0" font="SansSerif" halign="center" height="20"
-	     label="Refresh" label_selected="Refresh List" left="321"
-	     mouse_opaque="true" name="refresh_notices" width="90" />
+	<button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Refresh"
+	     label_selected="Refresh List" left="321" mouse_opaque="true"
+	     name="refresh_notices" width="90" />
 	<panel border="false" bottom="0" follows="all" height="268" label="Create New Notice"
 	     left="1" mouse_opaque="true" name="panel_create_new_notice" width="418">
 		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
index c79db97..925d224 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" height="466" label="Members &amp; Roles" left="1"
      name="roles_tab" width="418">
-	<text name="default_needs_apply_text">
+	<string name="default_needs_apply_text">
 		There are unapplied changes on the current sub-tab.
-	</text>
-	<text name="want_apply_text">
+	</string>
+	<string name="want_apply_text">
 		Do you want to apply these changes?
-	</text>
-	<text name="cant_delete_role">
-		The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and cannot be deleted.
-	</text>
+	</string>
+	<string name="help_text" />
 	<button bottom="-24" font="SansSerif" halign="center" height="16" label="?" left="391"
 	     name="help_button" width="20" />
 	<panel border="false" bottom="-24" height="24" left="7" name="members_header"
@@ -88,11 +86,11 @@ execute the Ability.
 			     label="Invite New Person ..." left="4" name="member_invite" width="146" />
 			<button bottom_delta="0" font="SansSerif" halign="center" height="19"
 			     label="Eject From Group" left="-153" name="member_eject" width="146" />
-			<text name="help_text">
-				You can add or remove Roles assigned to Members. 
-				Select multiple Members by holding the Ctrl key and
-				clicking on their names.
-			</text>
+			<string name="help_text">
+				You can add or remove Roles assigned to Members.
+Select multiple Members by holding the Ctrl key and
+clicking on their names.
+			</string>
 			<icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" />
 		</panel>
 		<panel background_visible="true" border="true" bottom="0" height="164" label="Roles"
@@ -122,12 +120,15 @@ execute the Ability.
 			     label="Create New Role ..." left="4" name="role_create" width="146" />
 			<button bottom_delta="0" font="SansSerif" halign="center" height="19"
 			     label="Delete Role" left="-153" name="role_delete" width="146" />
-			<text name="help_text">
+			<string name="help_text">
 				Roles have a title and an allowed list of Abilities
 that Members can perform. Members can belong to 
 one or more Roles. A group can have up to 10 Roles,
 including the Everyone and Owner Roles.
-			</text>
+			</string>
+			<string name="cant_delete_role">
+				The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and cannot be deleted.
+			</string>
 			<icon height="0" image_name="inv_folder_plain_closed.tga" name="power_folder_icon"
 			     width="0" />
 			<icon height="0" image_name="checkbox_enabled_true.tga" name="power_all_have_icon"
@@ -150,18 +151,18 @@ including the Everyone and Owner Roles.
 			     width="80" />
 			<scroll_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-134"
 			     column_padding="0" draw_border="true" draw_heading="false"
-			     fg_disable_color="grey" fg_selected_color="black"
+			     draw_stripes="false" fg_disable_color="grey" fg_selected_color="black"
 			     fg_unselected_color="black" follows="left|top" height="134" left="6"
 			     mouse_opaque="true" multi_select="true" name="action_list"
-			     search_column="1"
-			     tool_tip="Select an Ability to view more details." width="392" draw_stripes="false">
+			     search_column="1" tool_tip="Select an Ability to view more details."
+			     width="392">
 				<column label="" name="icon" width="18" />
 				<column label="" name="action" width="356" />
 			</scroll_list>
-			<text name="help_text">
+			<string name="help_text">
 				Abilities allow Members in Roles to do specific
 things in this group. There&apos;s a broad variety of Abilities.
-			</text>
+			</string>
 			<icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" />
 		</panel>
 	</tab_container>
@@ -175,16 +176,17 @@ things in this group. There&apos;s a broad variety of Abilities.
 		     name="static2" width="150">
 			Allowed Abilities
 		</text>
-		<scroll_list bottom_delta="-199" draw_border="true" draw_heading="false" enabled="false"
-		     height="198" left="0" multi_select="false" name="member_assigned_roles"
-		     width="145" draw_stripes="false">
+		<scroll_list bottom_delta="-199" draw_border="true" draw_heading="false"
+		     draw_stripes="false" enabled="false" height="198" left="0"
+		     multi_select="false" name="member_assigned_roles" width="145">
 			<column label="" name="checkbox" width="18" />
 			<column label="" name="role" width="109" />
 		</scroll_list>
-		<scroll_list bottom_delta="0" draw_border="true" draw_heading="false" enabled="false"
-		     height="198" left="150" multi_select="false" name="member_allowed_actions"
+		<scroll_list bottom_delta="0" draw_border="true" draw_heading="false" draw_stripes="false"
+		     enabled="false" height="198" left="150" multi_select="false"
+		     name="member_allowed_actions"
 		     tool_tip="For Details of each Allowed Ability see the Abilities tab."
-		     width="254" draw_stripes="false">
+		     width="254">
 			<column label="" name="icon" width="14" />
 			<column label="" name="action" width="224" />
 		</scroll_list>
@@ -239,17 +241,18 @@ things in this group. There&apos;s a broad variety of Abilities.
 		     width="240">
 			Allowed Abilities
 		</text>
-		<scroll_list bottom_delta="-105" draw_border="true" enabled="false" height="105" left="0"
-		     multi_select="false" name="role_assigned_members" width="145" draw_stripes="false"/>
+		<name_list bottom_delta="-105" draw_border="true" draw_stripes="false" enabled="false"
+		     height="105" left="0" multi_select="false" name="role_assigned_members"
+		     width="145" />
 		<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
 		     initial_value="false" label="Members are visible" left="0"
 		     mouse_opaque="true" name="role_visible_in_list" radio_style="false"
 		     tool_tip="Sets whether members of this role are visible in the General tab   to people outside of the group."
 		     width="361" />
-		<scroll_list bottom_delta="0" draw_border="true" draw_heading="false" height="125"
-		     left="150" multi_select="false" name="role_allowed_actions"
+		<scroll_list bottom_delta="0" draw_border="true" draw_heading="false" draw_stripes="false"
+		     height="125" left="150" multi_select="false" name="role_allowed_actions"
+		     search_column="2"
 		     tool_tip="For Details of each Allowed Ability see the Abilities tab."
-		     search_column="2" draw_stripes="false"
 		     width="254">
 			<column label="" name="icon" width="2" />
 			<column label="" name="checkbox" width="16" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
index 8059fd1..1ab0ca9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" follows="all" height="466" label="Proposals" left="1"
      mouse_opaque="true" name="voting_tab" width="418">
-	<text name="help_text">
+	<string name="help_text">
 		Group Proposals can be used to get a feel
 for what the group wants to do, or how the
 group feels about something. If you have 
 the proper powers, you can create proposals,
 vote on open proposals, and view old proposals.
-	</text>
+	</string>
 	<panel background_opaque="true" background_visible="true" bevel_style="in"
 	     bg_alpha_color="blue" bg_opaque_color="0,0,0,0.3" border="true"
 	     bottom_delta="-210" follows="left|top" height="170" left="7"
@@ -44,7 +44,6 @@ vote on open proposals, and view old proposals.
 	     width="396">
 		Proposal                                                         Voting Ends                    Voted?
 	</text>
-
 	<scroll_list bottom_delta="-121" column_padding="5" column_widths="200,120,40"
 	     draw_border="true" height="120" left="11" mouse_opaque="true"
 	     multi_select="false" name="proposals" width="396" />
@@ -186,50 +185,49 @@ vote on open proposals, and view old proposals.
 	<button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
 	     label="View List" label_selected="View List" left="287" mouse_opaque="true"
 	     name="btn_view_history_list" width="120" />
-
-	<text name="proposals_header_view_txt" hidden="true">
+	<string name="proposals_header_view_txt">
 		Open Group Proposals
-	</text>
-	<text name="proposals_header_view_inst" hidden="true">
-Double Click on the proposal you would like to vote on or press
+	</string>
+	<string name="proposals_header_view_inst">
+		Double Click on the proposal you would like to vote on or press
 Create Proposal to create a new proposal.
-	</text>
-	<text name="proposals_header_create_txt" hidden="true">
+	</string>
+	<string name="proposals_header_create_txt">
 		Create Proposal
-	</text>
-	<text name="proposals_header_create_inst" hidden="true">
-Type the Proposal Description for the new proposal. You can change the
+	</string>
+	<string name="proposals_header_create_inst">
+		Type the Proposal Description for the new proposal. You can change the
 Quorum, Duration and Majority required to pass the proposal.
-	</text>
-	<text name="proposals_header_vote_txt" hidden="true">
+	</string>
+	<string name="proposals_header_vote_txt">
 		Proposal Vote
-	</text>
-	<text name="proposals_header_vote_inst" hidden="true">
-Press the Yes or No button to vote on the proposal,
+	</string>
+	<string name="proposals_header_vote_inst">
+		Press the Yes or No button to vote on the proposal,
 or choose to Abstain voting on this proposal.
-	</text>
-	<text name="proposals_header_voted_inst" hidden="true">
-You have voted: [VOTE]
-	</text>
-	<text name="empty_proposal_txt" hidden="true">
+	</string>
+	<string name="proposals_header_voted_inst">
+		You have voted: [VOTE]
+	</string>
+	<string name="empty_proposal_txt">
 		The proposal you are trying to create is empty.  Please fill out the proposal before creating it.
-	</text>
-	<text name="proposals_submit_yes_txt" hidden="true">
-Submitting Yes to proposal...
-	</text>
-	<text name="proposals_submit_no_txt" hidden="true">
-Submitting No to proposal...
-	</text>
-	<text name="proposals_submit_abstain_txt" hidden="true">
-Submitting Abstain to proposal...
-	</text>
-	<text name="proposals_submit_new_txt" hidden="true">
-Submitting new proposal...
-	</text>
-        <text name="vote_recorded" hidden="true">
-Your vote was received.
-	</text>
-	<text name="vote_previously_recorded" hidden="true">
-You have previously voted.  You are only allowed to vote once during an election.
-	</text>
+	</string>
+	<string name="proposals_submit_yes_txt">
+		Submitting Yes to proposal...
+	</string>
+	<string name="proposals_submit_no_txt">
+		Submitting No to proposal...
+	</string>
+	<string name="proposals_submit_abstain_txt">
+		Submitting Abstain to proposal...
+	</string>
+	<string name="proposals_submit_new_txt">
+		Submitting new proposal...
+	</string>
+	<string name="vote_recorded">
+		Your vote was received.
+	</string>
+	<string name="vote_previously_recorded">
+		You have previously voted.  You are only allowed to vote once during an election.
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/xui/en-us/panel_groups.xml
index 0c36027..416f58b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_groups.xml
@@ -1,43 +1,37 @@
-<panel bottom="-371" height="300" hidden="false" left="280"
-     mouse_opaque="true" name="groups" width="350" border="true">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"
+     name="groups" width="350">
 	<scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"
 	     draw_heading="false" draw_stripes="true" enabled="true"
-	     follows="left|top|right|bottom" hidden="false" left="10"
-	     mouse_opaque="true" multi_select="false" name="group list" tab_stop="true"
-	     top="-10" width="240">
+	     follows="left|top|right|bottom" left="10" mouse_opaque="true"
+	     multi_select="false" name="group list" tab_stop="true" top="-10"
+	     width="240">
 		<column label="" name="name" width="248" />
 	</scroll_list>
 	<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|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="12" mouse_opaque="false" name="groupdesc" v_pad="0"
-	     width="248">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupdesc" v_pad="0" width="248">
 		Your currently active group is displayed in bold.
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="12" mouse_opaque="false" name="groupcount" v_pad="0"
-	     width="248">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupcount" v_pad="0" width="248">
 		You belong to [COUNT] groups (of [MAX] maximum).
 	</text>
 	<pad bottom="-7" height="0" left="-90" width="1" />
 	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
 	     label="IM/Call" left_delta="0" name="IM"
 	     tool_tip="Open Instant Message session" width="80" />
-	<button bottom_delta="-25" follows="top|right"
-	     font="SansSerif" height="22" hidden="false" label="Info" name="Info"
-	     width="80" />
-	<button bottom_delta="-25" follows="top|right"
-	     font="SansSerif" height="22" hidden="false" label="Activate"
-	     name="Activate" width="80" />
-	<button bottom_delta="-25" follows="top|right"
-	     font="SansSerif" height="22" hidden="false" label="Leave" name="Leave"
-	     width="80" />
-	<button bottom_delta="-35" follows="top|right"
-	     font="SansSerif" height="22" hidden="false" label="Create..." name="Create"
-	     width="80" />
-	<button bottom_delta="-25" follows="top|right"
-	     font="SansSerif" height="22" hidden="false" label="Search..."
-	     name="Search..." width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Info" name="Info" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Activate" name="Activate" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Leave" name="Leave" width="80" />
+	<button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
+	     label="Create..." name="Create" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Search..." name="Search..." width="80" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml b/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml
index 7b8dd0b..f2e36d3 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml
@@ -45,16 +45,16 @@
 	     follows="left|top" font="SansSerifSmall" height="200" left="15"
 	     max_length="65535" name="covenant_editor" text_readonly_color="white"
 	     width="425" word_wrap="true" />
-	<text hidden="true" name="can_resell">
-		Purchased land in this region may be resold.
-	</text>
-	<text hidden="true" name="can_not_resell">
+	<string name="can_resell">
+		string land in this region may be resold.
+	</string>
+	<string name="can_not_resell">
 		Purchased land in this region may not be resold.
-	</text>
-	<text hidden="true" name="can_change">
+	</string>
+	<string name="can_change">
 		Purchased land in this region may be joined or subdivided.
-	</text>
-	<text hidden="true" name="can_not_change">
+	</string>
+	<string name="can_not_change">
 		Purchased land in this region may not be joined or subdivided.
-	</text>
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_login.xml b/linden/indra/newview/skins/xui/en-us/panel_login.xml
index 47ad4b3..8d2a658 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" follows="left|top|right|bottom" height="600" hidden="false" left="0"
+<panel bottom="0" follows="left|top|right|bottom" height="600" left="0"
      mouse_opaque="true" name="panel_login" width="800">
 	<web_browser border_visible="false" bottom="0" follows="top|left|bottom|right" left="0"
 	     name="login_html" right="-1"
 	     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
 	     top="-1" />
-	<text hidden="true" name="real_url">
+	<string name="real_url">
 		http://secondlife.com/app/login/
-	</text>
+	</string>
+	<string name="forgot_password_url">
+		http://secondlife.com/account/request.php
+	</string>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="54" drop_shadow_visible="true" follows="left|bottom"
 	     font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
@@ -61,12 +64,11 @@
 	<check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
 	     hidden="false" initial_value="false" label="Remember password"
 	     left_delta="165" mouse_opaque="true" name="remember_check" width="138" />
-	<button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-	     height="24" hidden="false" label="Connect" label_selected="Connect"
-	     left="440" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
-	     width="120" />
-	<button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-	     height="24" hidden="false" label="Quit" label_selected="Quit" left="572"
+	<button bottom="28" follows="left|bottom" font="SansSerif" halign="center" height="24"
+	     hidden="false" label="Connect" label_selected="Connect" left="440"
+	     mouse_opaque="true" name="connect_btn" scale_image="TRUE" width="120" />
+	<button bottom="28" follows="left|bottom" font="SansSerif" halign="center" height="24"
+	     hidden="false" label="Quit" label_selected="Quit" left="572"
 	     mouse_opaque="true" name="quit_btn" scale_image="TRUE" width="120" />
 	<combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
 	     hidden="false" left_delta="135" max_chars="20" mouse_opaque="true"
@@ -74,25 +76,22 @@
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="30" drop_shadow_visible="true" follows="right|bottom"
 	     font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
-	     left="-202" mouse_opaque="true" name="channel_text" v_pad="0" width="200"
-	     hover="true">
+	     hover="true" left="-202" mouse_opaque="true" name="channel_text" v_pad="0"
+	     width="200">
 		[Viewer Channel Name]
 	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="18" drop_shadow_visible="true" follows="right|bottom"
 	     font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
-	     left="-102" mouse_opaque="true" name="version_text" v_pad="0" width="100"
-	     hover="true">
+	     hover="true" left="-102" mouse_opaque="true" name="version_text" v_pad="0"
+	     width="100">
 		1.23.4 (5)
 	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="2" drop_shadow_visible="true" follows="right|bottom"
 	     font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
-	     left="-172" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="170"
-	     hover="true">
+	     hover="true" left="-172" mouse_opaque="true" name="forgot_password_text"
+	     v_pad="0" width="170">
 		Forgot your password?
 	</text>
-	<text hidden="true" name="forgot_password_url">
-		http://secondlife.com/account/request.php
-	</text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml b/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
index eb0a6d7..80ef984 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="-34"
      name="master_volume">
 	<button bottom="-22" height="22" image_overlay="icn-overlay_volume-panel.tga" label=""
@@ -9,7 +10,6 @@
 	     tool_tip="Change the volume using this slider" width="50" />
 	<button bottom="-20" control_name="MuteAudio" height="20"
 	     image_selected="icn_speaker-muted_dark.tga"
-	     toggle="true"
 	     image_unselected="icn_speaker_dark.tga" label="" left_delta="52"
-	     name="mute_master" width="25" />
+	     name="mute_master" toggle="true" width="25" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
index 66886b7..da1b519 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
@@ -1,23 +1,60 @@
+<?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" hidden="false" left="0"
-     name="media_controls" width="185">
+     enabled="true" follows="right|bottom" height="20" left="0"
+     name="media_controls" width="250">
+	<icon bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"
+	     image_name="icn_music.tga" label="" left_delta="2" mouse_opaque="true"
+	     name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"
+	     width="20" />
+	<button bottom="-22" enabled="true" follows="left|top" height="22"
+	     image_disabled="icn_media-play_disabled.tga"
+	     image_selected="icn_media-play_active.tga"
+	     image_unselected="icn_media-play_enabled.tga" label="" left_delta="22"
+	     mouse_opaque="true" name="music_play" scale_image="true" toggle="false"
+	     tool_tip="Play/pause streaming music" width="20" />
+	<button bottom="-22" enabled="false" follows="left|top" height="22" hidden="false"
+	     image_disabled="icn_media-pause_disabled.tga"
+	     image_selected="icn_media-pause_active.tga"
+	     image_unselected="icn_media-pause_enabled.tga" label="" left_delta="0"
+	     mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"
+	     tool_tip="Pause streaming music" width="20" />
+	<button bottom="-22" enabled="true" follows="left|top" height="22"
+	     image_disabled="icn_media-stop_disabled.tga"
+	     image_selected="icn_media-stop_active.tga"
+	     image_unselected="icn_media-stop_enabled.tga" label="" left_delta="20"
+	     mouse_opaque="true" name="music_stop" scale_image="true" toggle="false"
+	     tool_tip="Stop streaming music" width="20" />
+	<icon bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"
+	     image_name="icn_media.tga" label="" left_delta="22" mouse_opaque="true"
+	     name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"
+	     width="20" />
 	<button bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"
-	     image_overlay="icn_music-play.tga" label="" left_delta="2"
-	     mouse_opaque="true" name="music_play" scale_image="true" toggle="true"
-	     tool_tip="Play/pause streaming music" width="40" />
+	     image_disabled="icn_media-play_disabled.tga"
+	     image_selected="icn_media-play_active.tga"
+	     image_unselected="icn_media-play_enabled.tga" label="" left_delta="22"
+	     mouse_opaque="true" name="media_play" scale_image="true" toggle="false"
+	     tool_tip="Play/pause streaming music" width="20" />
+	<button bottom="-22" enabled="false" follows="left|top" height="22" hidden="false"
+	     image_disabled="icn_media-pause_disabled.tga"
+	     image_selected="icn_media-pause_active.tga"
+	     image_unselected="icn_media-pause_enabled.tga" label="" left_delta="0"
+	     mouse_opaque="true" name="media_pause" scale_image="true" toggle="false"
+	     tool_tip="Pause streaming media" width="20" />
 	<button bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"
-	     image_overlay="icn_media-play.tga" label="" left_delta="40"
-	     mouse_opaque="true" name="media_play" scale_image="true" toggle="true"
-	     tool_tip="Play/pause streaming movies" width="40" />
-	<volume_slider bottom="-20" control_name="AudioLevelMaster" height="17" increment="0.05"
-	     initial_val="0.5" left_delta="34" max_val="1" min_val="0"
-	     mouse_opaque="true" name="volume_slider"
-	     tool_tip="Master Volume" width="60" />
+	     image_disabled="icn_media-stop_disabled.tga"
+	     image_selected="icn_media-stop_active.tga"
+	     image_unselected="icn_media-stop_enabled.tga" label="" left_delta="20"
+	     mouse_opaque="true" name="media_stop" scale_image="true" toggle="false"
+	     tool_tip="Stop streaming media" width="20" />
+	<volume_slider bottom="-20" control_name="AudioLevelMaster" height="22" increment="0.05"
+	     initial_val="0.5" left_delta="20" max_val="1" min_val="0"
+	     mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"
+	     width="60" />
 	<button bottom="-20" control_name="MuteAudio" height="20"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" left_delta="60"
-	     name="mute_master" toggle="true" width="25" tool_tip="Master Mute"/>
+	     name="mute_master" toggle="true" tool_tip="Master Mute" width="25" />
 	<button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""
-		left_delta="25" name="expand" scale_image="true" toggle="true"
-		tool_tip="Adjust individual volume levels" width="22" />
+	     left_delta="25" name="expand" scale_image="true" toggle="true"
+	     tool_tip="Adjust individual volume levels" width="22" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
index cd0b985..e3c3427 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
@@ -1,6 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="1"
-     enabled="true" follows="right|bottom" height="20" hidden="false" left="0" use_bounding_rect="true"
-     name="media_remote" width="185">
-	<panel filename="panel_bg_tab.xml" left="0" bottom="0" width="185" height="22"/>
-	<panel filename="panel_media_controls.xml" left="0" bottom="0" width="185" height="20"/>
+     enabled="true" follows="right|bottom" height="20" left="0"
+     name="media_remote" use_bounding_rect="true" width="250">
+	<panel bottom="0" filename="panel_bg_tab.xml" height="22" left="0" width="250" />
+	<panel bottom="0" filename="panel_media_controls.xml" height="20" left="0" width="250" />
+	<string name="play_label">
+		Play
+	</string>
+	<string name="stop_label">
+		Stop
+	</string>
+	<string name="pause_label">
+		Pause
+	</string>
+	<string name="default_tooltip_label">
+		No Media Specified
+	</string>
+	<string name="media_hidden_label">
+		(URL hidden by parcel owner)
+	</string>
+	<string name="media_icon_tooltip_web">
+		This location displays content from the World Wide Web. Click the Play button to display Web content.
+	</string>
+	<string name="media_icon_tooltip_movie">
+		This location displays Video content. Click the Play button to play the video.
+	</string>
+	<string name="media_play_tooltip">
+		Display Web content at this location.
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml b/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
index 6c9d3a5..147497c 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="1"
-     height="185" hidden="false" follows="right|bottom" left="0" use_bounding_rect="true"
-     name="media_remote" width="185">
-	<panel filename="panel_bg_tab.xml" left="0" bottom="0" width="185" height="187"/>
+     follows="right|bottom" height="185" left="0" name="media_remote"
+     use_bounding_rect="true" width="250">
+	<panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="250" />
 	<panel border="false" bottom="20" filename="panel_audio.xml" height="160"
-	     label="Audio &amp; Video" name="Volume Panel" width="185" />
-	<panel bottom_delta="-10" left="0" filename="panel_media_controls.xml"/>
+	     label="Audio &amp; Video" name="Volume Panel" width="250" />
+	<panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml
index a99333e..6f8f3db 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml
@@ -1,27 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="-34"
-     enabled="true" follows="left|top" hidden="false"
-     mouse_opaque="true" name="music_remote">
-<!-- 	<text type="string" length="6" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" -->
-<!-- 	     bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top" -->
-<!-- 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false" -->
-<!-- 	     left="2" mouse_opaque="true" name="text" v_pad="0" width="77"> -->
-<!-- 		Music -->
-<!-- 	</text> -->
-	<icon name="music_icon" left="5" bottom="-19" width="16" height="16" image_name="music_icon.tga"/>
+     enabled="true" follows="left|top" mouse_opaque="true" name="music_remote">
+	<icon bottom="-19" height="16" image_name="music_icon.tga" left="5" name="music_icon"
+	     width="16" />
 	<button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
-	     halign="center" height="17" hidden="false"
-	     image_selected="button_anim_stop_selected.tga"
+	     halign="center" height="17" image_selected="button_anim_stop_selected.tga"
 	     image_unselected="button_anim_stop.tga" label="" label_selected=""
 	     left_delta="25" mouse_opaque="true" name="music_stop" scale_image="true"
 	     tool_tip="Stop media" width="17" />
 	<button bottom="-20" enabled="true" follows="left|top" font="SansSerif" halign="center"
-	     height="17" hidden="false" image_selected="button_anim_play_selected.tga"
+	     height="17" image_selected="button_anim_play_selected.tga"
 	     image_unselected="button_anim_play.tga" label="" label_selected=""
 	     left_delta="17" mouse_opaque="true" name="music_play" scale_image="true"
 	     tool_tip="Play media stream" width="17" />
 	<button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
-	     halign="center" height="17" hidden="false"
-	     image_disabled="button_disabled_32x128.tga"
+	     halign="center" height="17" image_disabled="button_disabled_32x128.tga"
 	     image_disabled_selected="button_disabled_32x128.tga"
 	     image_selected="button_anim_pause_selected.tga"
 	     image_unselected="button_anim_pause.tga" label="" label_selected=""
diff --git a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
index 774b70a..defefde 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
@@ -1,52 +1,60 @@
-<panel follows="left|right|bottom|top" height="200" left="-1"
-     mouse_opaque="false" name="overlay" width="728" use_bounding_rect="true">
-	<layout_stack bottom="0" follows="left|right|bottom" height="200" left="1" mouse_opaque="false"
-	     orientation="horizontal" right="-1" name="overlay_layout_panel" use_bounding_rect="true">
-		<layout_panel auto_resize="true" bottom="0" left="0" min_width="420" user_resize="false" mouse_opaque="false"
-		     width="420" use_bounding_rect="true">
-      <layout_stack name="chatbar_and_buttons" bottom="0" follows="left|right|bottom|top" height="50" left="1" mouse_opaque="false" orientation="vertical" right="420" use_bounding_rect="true">
-        <layout_panel auto_resize="true" bottom="0" left="0" min_width="100" user_resize="false"
-					width="420" height="0" min_height="20" name="padding" follows="left|bottom|right|top"  mouse_opaque="false" use_bounding_rect="true"/>
-        <layout_panel auto_resize="false" bottom="0" left="0" min_width="100" user_resize="false"
-					width="420" height="20" min_height="20" name="state_buttons" follows="left|bottom|right|top"  mouse_opaque="false" use_bounding_rect="true">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel follows="left|right|bottom|top" height="200" left="-1" mouse_opaque="false"
+     name="overlay" use_bounding_rect="true" width="728">
+	<layout_stack bottom="0" follows="left|right|bottom" height="200" left="1"
+	     mouse_opaque="false" name="overlay_layout_panel" orientation="horizontal"
+	     right="-1" use_bounding_rect="true">
+		<layout_panel auto_resize="true" bottom="0" left="0" min_width="420" mouse_opaque="false"
+		     use_bounding_rect="true" user_resize="false" width="420">
+			<layout_stack bottom="0" follows="left|right|bottom|top" height="50" left="1"
+			     mouse_opaque="false" name="chatbar_and_buttons" orientation="vertical"
+			     right="420" use_bounding_rect="true">
+				<layout_panel auto_resize="true" bottom="0" follows="left|bottom|right|top" height="0"
+				     left="0" min_height="20" min_width="100" mouse_opaque="false"
+				     name="padding" use_bounding_rect="true" user_resize="false" width="420" />
+				<layout_panel auto_resize="false" bottom="0" follows="left|bottom|right|top" height="20"
+				     left="0" min_height="20" min_width="100" mouse_opaque="false"
+				     name="state_buttons" use_bounding_rect="true" user_resize="false"
+				     width="420">
 					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-						label="IM Received" label_selected="IM Received" left="0"
-						name="IM Received" scale_image="true"
-						tool_tip="You have an instant message pending. Click to show IMs."
-						width="102" />
+					     label="IM Received" label_selected="IM Received" left="0"
+					     name="IM Received" scale_image="true"
+					     tool_tip="You have an instant message pending. Click to show IMs."
+					     width="102" />
 					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-						label="Set Not Busy" label_selected="Set Not Busy" left="114"
-						name="Set Not Busy" scale_image="true"
-						tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
-						width="102" />
+					     label="Set Not Busy" label_selected="Set Not Busy" left="114"
+					     name="Set Not Busy" scale_image="true"
+					     tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
+					     width="102" />
 					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-						label="Release Keys" label_selected="Release Keys" left="229"
-						name="Release Keys" scale_image="true"
-						tool_tip="A script has taken control of your keys. Click here to release them."
-						width="102" />
+					     label="Release Keys" label_selected="Release Keys" left="229"
+					     name="Release Keys" scale_image="true"
+					     tool_tip="A script has taken control of your keys. Click here to release them."
+					     width="102" />
 					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-						label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook"
-						scale_image="true"
-						tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
-						width="102" />
+					     label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook"
+					     scale_image="true"
+					     tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
+					     width="102" />
 					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-						label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up"
-						scale_image="true" tool_tip="Click here to stand up." width="102" />
+					     label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up"
+					     scale_image="true" tool_tip="Click here to stand up." width="102" />
 				</layout_panel>
 				<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
-					filename="panel_chat_bar.xml" follows="left|right|bottom" left="0" mouse_opaque="false"
-					name="chat_bar" min_height="23" width="395" use_bounding_rect="true"/>
+				     filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
+				     min_height="23" mouse_opaque="false" name="chat_bar"
+				     use_bounding_rect="true" width="395" />
 			</layout_stack>
 		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" left="0" min_width="185" user_resize="false"
-		     width="185" use_bounding_rect="true" name="media_remote_container" mouse_opaque="false">
-			<panel background_visible="false" border="false" bottom="1"
-			     name="media_remote" /> 
+		<layout_panel auto_resize="false" bottom="0" left="0" min_width="250" mouse_opaque="false"
+		     name="media_remote_container" use_bounding_rect="true" user_resize="false"
+		     width="250">
+			<panel background_visible="false" border="false" bottom="1" name="media_remote" />
 		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" left="0" min_width="128" user_resize="false"
-		     width="128" name="voice_remote_container" use_bounding_rect="true" mouse_opaque="false">
-			<panel background_visible="false" border="false" bottom="1"
-			     name="voice_remote" />
+		<layout_panel auto_resize="false" bottom="0" left="0" min_width="128" mouse_opaque="false"
+		     name="voice_remote_container" use_bounding_rect="true" user_resize="false"
+		     width="128">
+			<panel background_visible="false" border="false" bottom="1" name="voice_remote" />
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place.xml b/linden/indra/newview/skins/xui/en-us/panel_place.xml
index 479e8be..5d3e40b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place.xml
@@ -4,50 +4,52 @@
      name="Place" title="Place" width="450">
 	<texture_picker bottom="95" follows="left|top" height="300" left="20" name="snapshot_ctrl"
 	     width="400" />
-	<text bottom_delta="-10" follows="left|top"
-	     font="SansSerif" height="20" left="20">
-				Name:
+	<text bottom_delta="-10" follows="left|top" font="SansSerif" height="20" left="20">
+		Name:
 	</text>
-	<text bottom_delta="0" follows="left|top"
-	     font="SansSerif" height="20" left="60" name="name_editor"
-	     text_color="white"
-	     width="361" />
-	     
-	<text bottom_delta="-20" follows="left|top"
-	     font="SansSerif" height="20" left="20">
-				Description:
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+	     name="name_editor" text_color="white" width="361" />
+	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20">
+		Description:
 	</text>
-	<text_editor bottom_delta="-68" bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
-	     height="70" left="20" max_length="1023" name="desc_editor"
-	     text_readonly_color="white" width="400" word_wrap="true"></text_editor>
-	     
-	<text bottom_delta="-25" follows="left|top"
-	     font="SansSerif" height="20" left="20">
-				Information:
+	<text_editor bg_readonly_color="clear" bottom_delta="-68" enabled="false" follows="left|top"
+	     font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
+	     text_readonly_color="white" width="400" word_wrap="true" />
+	<text bottom_delta="-25" follows="left|top" font="SansSerif" height="20" left="20">
+		Information:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif"
-		text_color="white"
-	     height="20" left="95" name="info_editor" width="328"  />
-	     
-	<text bottom_delta="-20" follows="left|top"
-	     font="SansSerif" height="20" left="20">
-				Location:
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
+	     name="info_editor" text_color="white" width="328" />
+	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20">
+		Location:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif"
-	     height="20" left="95" name="location_editor"
-	     width="342" text_color="white" />
-	     
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
+	     name="location_editor" text_color="white" width="342" />
 	<button bottom_delta="-20" follows="left|top" height="20" label="Teleport" left="20"
 	     name="teleport_btn" width="100" />
 	<button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
 	     name="map_btn" width="100" />
 	<button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
 	     name="auction_btn" width="80" />
-	<string name="traffic_text">Traffic: [TRAFFIC] </string>
-	<string name="area_text"> Area: [AREA] sq. m. </string>
-	<string name="forsale_text"> For Sale for L$ [PRICE] </string>
-	<string name="auction_text"> Auction ID [ID]. </string>
-	<text hidden="true" name="server_update_text">Place information not available without server update.</text>
-	<text hidden="true" name="server_error_text">Information about this location is unavailable at this time, please try again later.</text>
-	<text hidden="true" name="server_forbidden_text">Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.</text>
+	<string name="traffic_text">
+		Traffic: [TRAFFIC]
+	</string>
+	<string name="area_text">
+		Area: [AREA] sq. m.
+	</string>
+	<string name="forsale_text">
+		For Sale for L$ [PRICE]
+	</string>
+	<string name="auction_text">
+		Auction ID [ID].
+	</string>
+	<string name="server_update_text">
+		Place information not available without server update.
+	</string>
+	<string name="server_error_text">
+		Information about this location is unavailable at this time, please try again later.
+	</string>
+	<string name="server_forbidden_text">
+		Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
index 0b846f1..e237bb9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
@@ -4,50 +4,52 @@
      name="Place" title="Place" width="450">
 	<texture_picker bottom="-274" follows="left|top" height="270" left="20" name="snapshot_ctrl"
 	     width="360" />
-	<text bottom_delta="-12" follows="left|top"
-	     font="SansSerif" height="20" left="20">
-				Name:
+	<text bottom_delta="-12" follows="left|top" font="SansSerif" height="20" left="20">
+		Name:
 	</text>
-	<text bottom_delta="0" follows="left|top"
-	     font="SansSerif" height="20" left="60" name="name_editor"
-	     text_color="white"
-	     width="320" />
-	     
-	<text bottom_delta="-24" follows="left|top"
-	     font="SansSerif" height="20" left="20">
-				Description:
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+	     name="name_editor" text_color="white" width="320" />
+	<text bottom_delta="-24" follows="left|top" font="SansSerif" height="20" left="20">
+		Description:
 	</text>
-	<text_editor bottom_delta="-68" bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
-	     height="70" left="20" max_length="1023" name="desc_editor"
-	     text_readonly_color="white" width="360" word_wrap="true"></text_editor>
-	     
-	<text bottom_delta="-30" follows="left|top"
-	     font="SansSerif" height="20" left="20">
-				Information:
+	<text_editor bg_readonly_color="clear" bottom_delta="-68" enabled="false" follows="left|top"
+	     font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
+	     text_readonly_color="white" width="360" word_wrap="true" />
+	<text bottom_delta="-30" follows="left|top" font="SansSerif" height="20" left="20">
+		Information:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif"
-		text_color="white"
-	     height="20" left="95" name="info_editor" width="328"  />
-	     
-	<text bottom_delta="-30" follows="left|top"
-	     font="SansSerif" height="20" left="20">
-				Location:
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
+	     name="info_editor" text_color="white" width="328" />
+	<text bottom_delta="-30" follows="left|top" font="SansSerif" height="20" left="20">
+		Location:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif"
-	     height="20" left="95" name="location_editor"
-	     width="342" text_color="white" />
-	     
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
+	     name="location_editor" text_color="white" width="342" />
 	<button bottom_delta="-25" follows="left|top" height="20" label="Teleport" left="20"
 	     name="teleport_btn" width="100" />
 	<button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
 	     name="map_btn" width="100" />
 	<button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
 	     name="auction_btn" width="80" />
-	<string name="traffic_text">Traffic: [TRAFFIC] </string>
-	<string name="area_text"> Area: [AREA] sq. m. </string>
-	<string name="forsale_text"> For Sale for L$ [PRICE] </string>
-	<string name="auction_text"> Auction ID [ID]. </string>
-	<text hidden="true" name="server_update_text">Place information not available without server update.</text>
-	<text hidden="true" name="server_error_text">Information about this location is unavailable at this time, please try again later.</text>
-	<text hidden="true" name="server_forbidden_text">Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.</text>
+	<string name="traffic_text">
+		Traffic: [TRAFFIC]
+	</string>
+	<string name="area_text">
+		Area: [AREA] sq. m.
+	</string>
+	<string name="forsale_text">
+		For Sale for L$ [PRICE]
+	</string>
+	<string name="auction_text">
+		Auction ID [ID].
+	</string>
+	<string name="server_update_text">
+		Place information not available without server update.
+	</string>
+	<string name="server_error_text">
+		Information about this location is unavailable at this time, please try again later.
+	</string>
+	<string name="server_forbidden_text">
+		Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
+	</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_LCD.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_LCD.xml
index bd2eeba..2cc8b13 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_LCD.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_LCD.xml
@@ -1,70 +1,61 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Logitech LCD" left="102"
-     mouse_opaque="true" name="LCD Options" width="517">
+     height="408" label="Logitech LCD" left="102" mouse_opaque="true"
+     name="LCD Options" width="517">
 	<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="10" hidden="false"
-	     left="10" mouse_opaque="true" name="LCD Destination:" v_pad="0"
-	     width="266">
-		 LCD Destination:
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="true" name="LCD Destination:" v_pad="0" width="266">
+		LCD Destination:
 	</text>
-	
 	<radio_group bottom="-45" control_name="LCDDestination" draw_border="true" enabled="true"
-	     follows="left|top" height="36" hidden="false" left="148"
-	     mouse_opaque="true" name="LCDDestination" width="193">
-		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
-			tool_tip="Display forms selected appear on Logitech G15 Keyboard LCD"
-		    left="3" mouse_opaque="true" name="DestinationG15" width="463">
+	     follows="left|top" height="36" left="148" mouse_opaque="true"
+	     name="LCDDestination" width="193">
+		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="3"
+		     mouse_opaque="true" name="DestinationG15"
+		     tool_tip="Display forms selected appear on Logitech G15 Keyboard LCD"
+		     width="463">
 			Logitech G15 Gaming Keyboard
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
-			tool_tip="Display forms selected appear on Logitech Z10 Speaker LCD"
-		    left="3" mouse_opaque="true" name="DestinationZ10" width="463">
+		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" left="3"
+		     mouse_opaque="true" name="DestinationZ10"
+		     tool_tip="Display forms selected appear on Logitech Z10 Speaker LCD"
+		     width="463">
 			Logitech Z10 Speakers
 		</radio_item>
 	</radio_group>
-	
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-68" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="10" mouse_opaque="true" name="LCD Display Options" v_pad="0"
-	     width="266">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="true" name="LCD Display Options" v_pad="0" width="266">
 		LCD Display Options:
 	</text>
 	<check_box bottom="-72" control_name="DisplayChat" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" label="Display Chat"
-	     left="148" mouse_opaque="true" name="DisplayChat" radio_style="false"
-	     tool_tip="Display Last Chat line in LCD Window"
-	     width="128" />
-	<check_box bottom="-90" control_name="DisplayIM" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Display IM's"
-	     left="148" mouse_opaque="true" name="DisplayIM"
-	     radio_style="false"
-	     tool_tip="Display Last IM in LCD Window" width="242" />	     
-	<check_box bottom="-108" control_name="DisplayRegion" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Show Location Information" left="148"
-	     mouse_opaque="true" name="DisplayRegion" radio_style="false"
-	     tool_tip="Display current location information in LCD Window"
-	     width="201" />
-	<check_box bottom="-126" control_name="DisplayLinden" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Show Account Information" left="148"
-	     mouse_opaque="true" name="DisplayLinden" radio_style="false"
-	     tool_tip="Display current account information in LCD Window"
-	     width="201" />	     
-	<check_box bottom="-144" control_name="DisplayDebug" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Display Network Comms Info"
-	     left="148" mouse_opaque="true" name="DisplayDebug"
-	     radio_style="false"
+	     font="SansSerifSmall" height="16" label="Display Chat" left="148"
+	     mouse_opaque="true" name="DisplayChat" radio_style="false"
+	     tool_tip="Display Last Chat line in LCD Window" width="128" />
+	<check_box bottom="-90" control_name="DisplayIM" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Display IM&apos;s" left="148" mouse_opaque="true" name="DisplayIM"
+	     radio_style="false" tool_tip="Display Last IM in LCD Window" width="242" />
+	<check_box bottom="-108" control_name="DisplayRegion" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Show Location Information" left="148" mouse_opaque="true"
+	     name="DisplayRegion" radio_style="false"
+	     tool_tip="Display current location information in LCD Window" width="201" />
+	<check_box bottom="-126" control_name="DisplayLinden" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Show Account Information" left="148" mouse_opaque="true"
+	     name="DisplayLinden" radio_style="false"
+	     tool_tip="Display current account information in LCD Window" width="201" />
+	<check_box bottom="-144" control_name="DisplayDebug" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Display Network Comms Info" left="148" mouse_opaque="true"
+	     name="DisplayDebug" radio_style="false"
 	     tool_tip="Display debug information in LCD Window" width="242" />
 	<check_box bottom="-162" control_name="DisplayDebugConsole" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Display Debug Info from Console"
-	     left="148" mouse_opaque="true" name="DisplayDebugConsole"
-	     radio_style="false"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Display Debug Info from Console" left="148" mouse_opaque="true"
+	     name="DisplayDebugConsole" radio_style="false"
 	     tool_tip="Display console debug information in LCD Window" width="242" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
index 7ef1b6f..377e9a4 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
@@ -1,77 +1,70 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Audio &amp; Video" left="102"
-     mouse_opaque="true" name="Media panel" width="517">
+     height="408" label="Audio &amp; Video" left="102" mouse_opaque="true"
+     name="Media panel" width="517">
 	<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|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="muting_text" v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+	     mouse_opaque="true" name="muting_text" v_pad="0" width="128">
 		Volume:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="doppler_effect_text" v_pad="0"
-	     width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+	     mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
 		Streaming Preferences:
 	</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="12" hidden="false"
-	     left="10" mouse_opaque="true" name="doppler_effect_text" v_pad="0"
-	     width="128">
+	     bottom="-280" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+	     mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
 		Audio Preferences:
 	</text>
-
-	<panel border="true" bottom="-195" enabled="true" follows="left|top|right|bottom"
-	       hidden="false" label="Volume" left="148" height="180" width="205"
-	       mouse_opaque="true" name="Volume Panel"
-	       filename="panel_audio.xml">
-	</panel>
-
+	<panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
+	     follows="left|top|right|bottom" height="180" label="Volume" left="148"
+	     mouse_opaque="true" name="Volume Panel" width="260" />
 	<check_box bottom="-220" control_name="AudioStreamingMusic" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 	     label="Play Streaming Music When Available (uses more bandwidth)"
 	     left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
 	     width="339" />
 	<check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="true"
-	     label="Play Streaming Video When Available (uses more bandwidth)"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+	     label="Play Streaming Media When Available (uses more bandwidth)"
 	     left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
 	     width="338" />
-
-
-	<check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+	<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+	     initial_value="true" label="Automatically play media" left="162"
+	     mouse_opaque="true" name="auto_streaming_video" radio_style="false"
+	     width="338" />
+	<check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 	     label="Mute Audio When Window Minimized" left="142" mouse_opaque="true"
 	     name="mute_when_minimized" radio_style="false" width="215" />
-	<slider bottom_delta="-20" control_name="AudioLevelDoppler" enabled="true"
-	     follows="left|top" height="15" hidden="false" increment="0.1"
-	     initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
-	     name="Doppler Effect" width="250"
-	     label="Doppler Effect" show_text="true" edit_text="true" label_width="100"  />
-	<slider bottom_delta="-20" control_name="AudioLevelDistance" enabled="true"
-	     follows="left|top" height="15" hidden="false" increment="0.1"
-	     initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
-	     name="Distance Factor" width="250"
-	     label="Distance Factor" show_text="true" edit_text="true" label_width="100"  />
-	<slider bottom_delta="-20" control_name="AudioLevelRolloff" enabled="true"
-	     follows="left|top" height="15" hidden="false" increment="0.1"
-	     initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
-	     name="Rolloff Factor" width="250"
-	     label="Rolloff Factor" show_text="true" edit_text="true" label_width="100"  />
-
+	<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true"
+	     enabled="true" follows="left|top" height="15" increment="0.1"
+	     initial_val="1" label="Doppler Effect" label_width="100" left="148"
+	     max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
+	     show_text="true" width="250" />
+	<slider bottom_delta="-20" control_name="AudioLevelDistance" edit_text="true"
+	     enabled="true" follows="left|top" height="15" increment="0.1"
+	     initial_val="1" label="Distance Factor" label_width="100" left="148"
+	     max_val="2" min_val="0" mouse_opaque="true" name="Distance Factor"
+	     show_text="true" width="250" />
+	<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
+	     enabled="true" follows="left|top" height="15" increment="0.1"
+	     initial_val="1" label="Rolloff Factor" label_width="100" left="148"
+	     max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
+	     show_text="true" width="250" />
 	<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" hidden="false" increment="10"
+	     enabled="true" follows="left|top" height="16" increment="10"
 	     initial_val="10" label="L$ Change Threshold" label_width="128" left="148"
 	     max_val="10000" min_val="0" mouse_opaque="true" name="L$ Change Threshold"
 	     width="192" />
-	<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" hidden="false" increment="10"
-	     initial_val="20" label="Health Change Threshold" label_width="128"
-	     left="148" max_val="10000" min_val="0" mouse_opaque="true"
-	     name="Health Change Threshold" width="192" />
-
+	<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
+	     decimal_digits="0" enabled="true" follows="left|top" height="16"
+	     increment="10" initial_val="20" label="Health Change Threshold"
+	     label_width="128" left="148" max_val="10000" min_val="0"
+	     mouse_opaque="true" name="Health Change Threshold" width="192" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
index 52184bb..4ac9ddd 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
@@ -1,157 +1,150 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Text Chat" left="102" mouse_opaque="true"
-     name="chat" width="517">
+     height="408" label="Text Chat" left="102" mouse_opaque="true" name="chat"
+     width="517">
 	<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="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box" v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box" v_pad="0" width="128">
 		Chat Font Size:
 	</text>
 	<radio_group bottom="-72" control_name="ChatFontSize" draw_border="true" enabled="true"
-	     follows="left|top" height="60" hidden="false" left="148"
-	     mouse_opaque="true" name="chat font size" width="128">
-		<radio_item type="string" length="1" bottom="-20" enabled="true" height="16" hidden="false" left="0"
-		     mouse_opaque="true" name="radio" width="98">
+	     follows="left|top" height="60" left="148" mouse_opaque="true"
+	     name="chat font size" width="128">
+		<radio_item type="string" length="1" bottom="-20" enabled="true" height="16" left="0" mouse_opaque="true"
+		     name="radio" width="98">
 			Small
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-40" enabled="true" height="16" hidden="false" left="0"
-		     mouse_opaque="true" name="radio2" width="98">
+		<radio_item type="string" length="1" bottom="-40" enabled="true" height="16" left="0" mouse_opaque="true"
+		     name="radio2" width="98">
 			Medium
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-60" enabled="true" height="16" hidden="false" left="0"
-		     mouse_opaque="true" name="radio3" width="98">
+		<radio_item type="string" length="1" bottom="-60" enabled="true" height="16" left="0" mouse_opaque="true"
+		     name="radio3" width="98">
 			Large
 		</radio_item>
 	</radio_group>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-95" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box2" v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box2" v_pad="0" width="128">
 		Chat Color:
 	</text>
-	
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
 	     can_apply_immediately="true" color="0.8 1 1 1"
 	     control_name="SystemChatColor" enabled="true" follows="left|top"
-	     height="56" hidden="false" label="System" left="148" mouse_opaque="true"
-	     name="system" width="48" />
+	     height="56" label="System" left="148" mouse_opaque="true" name="system"
+	     width="48" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
 	     can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-	     enabled="true" follows="left|top" height="56" hidden="false" label="Users"
-	     left_delta="54" mouse_opaque="true" name="users" width="48" />
+	     enabled="true" follows="left|top" height="56" label="Users" left_delta="54"
+	     mouse_opaque="true" name="users" width="48" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
 	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
 	     control_name="ObjectChatColor" enabled="true" follows="left|top"
-	     height="56" hidden="false" label="Objects" left_delta="54" mouse_opaque="true"
+	     height="56" label="Objects" left_delta="54" mouse_opaque="true"
 	     name="objects" width="48" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
 	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
 	     control_name="llOwnerSayChatColor" enabled="true" follows="left|top"
-	     height="56" hidden="false" label="Owner" left_delta="54" mouse_opaque="true"
-	     name="owner" width="48" />	
+	     height="56" label="Owner" left_delta="54" mouse_opaque="true" name="owner"
+	     width="48" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
 	     can_apply_immediately="true" color="0 0 0 1"
 	     control_name="BackgroundChatColor" enabled="true" follows="left|top"
-	     height="56" hidden="false" label="Bubble" left_delta="54" mouse_opaque="true"
+	     height="56" label="Bubble" left_delta="54" mouse_opaque="true"
 	     name="background" width="48" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
 	     can_apply_immediately="true" color="0.6 0.6 1 1"
 	     control_name="HTMLLinkColor" enabled="true" follows="left|top" height="56"
-	     hidden="false" label="URLs" left_delta="54" mouse_opaque="true" name="links"
-	     width="48" />
-	     
+	     label="URLs" left_delta="54" mouse_opaque="true" name="links" width="48" />
 	<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="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box3" v_pad="0" width="135">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box3" v_pad="0" width="135">
 		Chat Console:
 	</text>
-	<spinner bottom_delta="-6" control_name="ChatPersistTime" decimal_digits="0" enabled="true"
-	     follows="left|top" height="16" hidden="false" increment="1"
+	<spinner bottom_delta="-6" control_name="ChatPersistTime" decimal_digits="0"
+	     enabled="true" follows="left|top" height="16" increment="1"
 	     initial_val="10" label="Fade chat after" label_width="80" left="148"
 	     max_val="60" min_val="2" mouse_opaque="true" name="fade_chat_time"
 	     width="130" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="6" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="282" mouse_opaque="false" name="text_box4" v_pad="0" width="80">
+	     bottom_delta="6" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="10" left="282" mouse_opaque="false" name="text_box4" v_pad="0"
+	     width="80">
 		(seconds)
 	</text>
-	<spinner bottom_delta="-6" control_name="ConsoleMaxLines" decimal_digits="0" enabled="true"
-	     follows="left|top" height="16" hidden="false" increment="1"
+	<spinner bottom_delta="-6" control_name="ConsoleMaxLines" decimal_digits="0"
+	     enabled="true" follows="left|top" height="16" increment="1"
 	     initial_val="10" left="340" max_val="50" min_val="1" mouse_opaque="true"
 	     name="max_chat_count" width="60" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="6" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="405" mouse_opaque="false" name="text_box5" v_pad="0" width="60">
+	     bottom_delta="6" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="10" left="405" mouse_opaque="false" name="text_box5" v_pad="0"
+	     width="60">
 		(# lines)
 	</text>
 	<slider bottom="-185" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
 	     decimal_digits="3" enabled="true" follows="left|top" height="12"
-	     hidden="false" increment="0.05" initial_val="1" label="Opacity" left="148"
-	     max_val="1" min_val="0" mouse_opaque="true" name="console_opacity"
-	     show_text="true" value="0.4" width="200" />
-
+	     increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
+	     min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
+	     value="0.4" width="200" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-207" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box6" v_pad="0" width="135">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">
 		Chat Options:
 	</text>
-	<check_box bottom_delta="-6" control_name="ChatFullWidth" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	<check_box bottom_delta="-6" control_name="ChatFullWidth" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Chat uses full screen width (after restart)" left="148"
 	     mouse_opaque="true" name="chat_full_width_check" radio_style="false"
 	     width="239" />
 	<check_box bottom_delta="-20" control_name="CloseChatOnReturn" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Close chat after hitting return" left="148"
-	     mouse_opaque="true" name="close_chat_on_return_check" radio_style="false"
-	     width="237" />
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Close chat after hitting return" left="148" mouse_opaque="true"
+	     name="close_chat_on_return_check" radio_style="false" width="237" />
 	<check_box bottom_delta="-20" control_name="ArrowKeysMoveAvatar" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Arrow keys always move avatar when chatting"
-	     left="148" mouse_opaque="true" name="arrow_keys_move_avatar_check"
-	     radio_style="false" width="237" />
-	<check_box bottom_delta="-20" control_name="ChatShowTimestamps" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Show timestamps in chat" left="148"
-	     mouse_opaque="true" name="show_timestamps_check" radio_style="false"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Arrow keys always move avatar when chatting" left="148"
+	     mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
 	     width="237" />
-
+	<check_box bottom_delta="-20" control_name="ChatShowTimestamps" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Show timestamps in chat" left="148" mouse_opaque="true"
+	     name="show_timestamps_check" radio_style="false" width="237" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-292" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box7" v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box7" v_pad="0" width="128">
 		Bubble Chat:
 	</text>
 	<check_box bottom="-299" control_name="UseChatBubbles" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show chat bubbles" left="148" mouse_opaque="true"
 	     name="bubble_text_chat" radio_style="false" width="237" />
 	<slider bottom="-315" can_edit_text="false" control_name="ChatBubbleOpacity"
 	     decimal_digits="3" enabled="true" follows="left|top" height="12"
-	     hidden="false" increment="0.05" initial_val="1" label="Opacity" left="148"
-	     max_val="1" min_val="0" mouse_opaque="true" name="bubble_chat_opacity"
-	     show_text="true" value="0.5" width="200" />
-
+	     increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
+	     min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
+	     value="0.5" width="200" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-339" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box8" v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box8" v_pad="0" width="128">
 		Script Errors:
 	</text>
 	<check_box bottom="-346" control_name="ScriptErrorsAsChat" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show script errors and warnings as regular chat" left="148"
 	     mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
 	     width="275" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-403"
 	     can_apply_immediately="true" color="0.82 0.82 0.99 1"
 	     control_name="ScriptErrorColor" enabled="true" follows="left|top"
-	     height="56" hidden="false" label="Color" left="148" mouse_opaque="true"
+	     height="56" label="Color" left="148" mouse_opaque="true"
 	     name="script_error" width="48" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
index c560788..696c404 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
@@ -1,133 +1,144 @@
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="General" left="102" mouse_opaque="true"
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+     height="408" label="General" left="102" mouse_opaque="true"
      name="general_panel" width="517">
 	<combo_box allow_text_entry="true" bottom="-24" enabled="true" follows="left|bottom"
-	     height="16" hidden="false" left="155" max_chars="128" mouse_opaque="true"
-	     name="location_combobox" width="146" >
+	     height="16" left="155" max_chars="128" mouse_opaque="true"
+	     name="location_combobox" width="146">
 		<combo_item name="MyHome" value="My Home">
 			My Home
 		</combo_item>
 		<combo_item name="MyLastLocation" value="My Last Location">
 			My Last Location
 		</combo_item>
-	</combo_box>     
+	</combo_box>
 	<check_box bottom="-44" control_name="ShowStartLocation" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+	     font="SansSerifSmall" height="16" initial_value="true"
 	     label="Show Start Location on Login Screen" left="151" mouse_opaque="true"
 	     name="show_location_checkbox" radio_style="false" width="256" />
 	<radio_group bottom="-108" control_name="RenderName" draw_border="true" enabled="true"
-	     follows="left|top" height="54" hidden="false" left="155"
-	     mouse_opaque="true" name="fade_out_radio" width="128">
-		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="6" mouse_opaque="true" name="Never" width="463">
+	     follows="left|top" height="54" left="155" mouse_opaque="true"
+	     name="fade_out_radio" width="128">
+		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="6"
+		     mouse_opaque="true" name="Never" width="463">
 			Never
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="6" mouse_opaque="true" name="Temporarily" width="463">
+		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" left="6"
+		     mouse_opaque="true" name="Temporarily" width="463">
 			Show Temporarily
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="6" mouse_opaque="true" name="Always" width="463">
+		<radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" left="6"
+		     mouse_opaque="true" name="Always" width="463">
 			Always
 		</radio_item>
 	</radio_group>
 	<check_box bottom="-134" control_name="RenderNameHideSelf" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Hide My Name On My Screen" left="151"
-	     mouse_opaque="true" name="show_my_name_checkbox" radio_style="false"
-	     width="256" />
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Hide My Name On My Screen" left="151" mouse_opaque="true"
+	     name="show_my_name_checkbox" radio_style="false" width="256" />
 	<check_box bottom="-152" control_name="RenderHideGroupTitle" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Hide My Group Title" left="151"
-	     mouse_opaque="true" name="show_my_title_checkbox" radio_style="false"
-	     width="256" />
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Hide My Group Title" left="151" mouse_opaque="true"
+	     name="show_my_title_checkbox" radio_style="false" width="256" />
 	<check_box bottom="-170" control_name="SmallAvatarNames" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+	     font="SansSerifSmall" height="16" initial_value="true"
 	     label="Small Avatar Names" left="151" mouse_opaque="true"
 	     name="small_avatar_names_checkbox" radio_style="false" width="256" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-236"
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-214"
 	     can_apply_immediately="false" color="1 1 1 1" control_name="EffectColor"
-	     enabled="true" follows="left|top" height="56" hidden="false" label=""
-	     left="153" mouse_opaque="true" name="effect_color_swatch"
-	     tool_tip="Click to open Color Picker" width="40" />
-	<spinner bottom="-246" control_name="AFKTimeout" enabled="true" follows="left|top"
-	     height="16" hidden="false" increment="1" initial_val="300"
-	     label="Away Timeout:" label_width="141" left="10" max_val="600"
-	     min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />	     
-	<check_box bottom="-272" control_name="ChatOnlineNotification" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Show Online Friend Notifications" left="151"
-	     mouse_opaque="true" name="friends_online_notify_checkbox"
-	     radio_style="false" width="256" />
-	<check_box bottom="-290" control_name="MiniMapRotate" enabled="true" follows="left|top"
+	     enabled="true" follows="left|top" height="36" label="" left="153"
+	     mouse_opaque="true" name="effect_color_swatch"
+	     tool_tip="Click to open Color Picker" width="20" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="10" mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
+		UI Size:
+	</text>
+	<slider bottom="-217" can_edit_text="true" control_name="UIScaleFactor"
+	     decimal_digits="3" enabled="true" height="16" hidden="false"
+	     increment="0.025" initial_val="1" left="148" max_val="1.4" min_val="0.75"
+	     mouse_opaque="true" name="UI Scale" show_text="true" value="1" width="256" />
+	<check_box bottom="-236" control_name="UIAutoScale" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	     label="Use resolution independent scale" left="148" mouse_opaque="true"
+	     name="ui_auto_scale" radio_style="false" width="256" />
+	<spinner bottom="-260" control_name="AFKTimeout" enabled="true" follows="left|top"
+	     height="16" increment="1" initial_val="300" label="Away Timeout:"
+	     label_width="141" left="10" max_val="600" min_val="30" mouse_opaque="true"
+	     name="afk_timeout_spinner" width="202" />
+	<check_box bottom="-286" control_name="ChatOnlineNotification" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Show Online Friend Notifications" left="151" mouse_opaque="true"
+	     name="friends_online_notify_checkbox" radio_style="false" width="256" />
+	<check_box bottom="-304" control_name="MiniMapRotate" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Rotate Mini-Map" left="151" mouse_opaque="true"
 	     name="rotate_mini_map_checkbox" radio_style="false" width="256" />
-	<check_box bottom="-308" control_name="NotifyMoneyChange" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false"
+	<check_box bottom="-322" control_name="NotifyMoneyChange" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Notify when Linden dollars (L$) spent or received" left="151"
 	     mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
 	     width="256" />
-	<check_box bottom="-326" control_name="UseDefaultColorPicker" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Use default system color picker" left="151"
-	     mouse_opaque="true" name="use_system_color_picker_checkbox"
-	     radio_style="false"
+	<check_box bottom="-340" control_name="UseDefaultColorPicker" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Use default system color picker" left="151" mouse_opaque="true"
+	     name="use_system_color_picker_checkbox" radio_style="false"
 	     tool_tip="Use the default system color picker instead of the one built into Second Life."
 	     width="256" />
+	<check_box bottom="-358" control_name="ShowSearchBar" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	     label="Show search panel in overlay bar" left="151" mouse_opaque="true"
+	     name="show_search_panel" radio_style="false"
+	     tool_tip="Display the embedded search panel." width="256" />
 	<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="10" hidden="false"
-	     left="10" mouse_opaque="true" name="start_location_textbox" v_pad="0"
-	     width="394">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="true" name="start_location_textbox" v_pad="0" width="394">
 		Start Location:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="10" mouse_opaque="true" name="show_names_textbox" v_pad="0"
-	     width="394">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="true" name="show_names_textbox" v_pad="0" width="394">
 		Show Names:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="10" mouse_opaque="true" name="effects_color_textbox" v_pad="0"
-	     width="394">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
 		Color For My Effects:
 	</text>
 	<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="10" hidden="false"
-	     left="220" mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
+	     bottom="-254" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
+	     mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
 		seconds
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-372" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="18" hidden="false"
-	     left="10" mouse_opaque="true" name="crash_report_textbox" v_pad="0"
-	     width="394">
+	     bottom="-380" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
+	     mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
 		Crash reports:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-395" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="18" hidden="false"
-	     left="10" mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
+	     bottom="-402" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
+	     mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
 		Language:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" enabled="true"
+	     bottom_delta="-1" drop_shadow_visible="true" enabled="true"
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="18" hidden="false" left_delta="290" mouse_opaque="true"
-	     name="language_textbox2" v_pad="0" width="394">
+	     height="18" left_delta="293" mouse_opaque="true" name="language_textbox2"
+	     v_pad="0" width="400">
 		(Requires restart for full effect)
 	</text>
-	<text hidden="true" name="region_name_prompt">
+	<string name="region_name_prompt">
 		&lt;Type region name&gt;
-	</text>
-	<combo_box allow_text_entry="false" bottom="-372" enabled="true" follows="left|top"
-	     height="18" hidden="false" left="153" max_chars="20" mouse_opaque="true"
+	</string>
+	<combo_box allow_text_entry="false" bottom="-380" enabled="true" follows="left|top"
+	     height="18" left="153" max_chars="20" mouse_opaque="true"
 	     name="crash_behavior_combobox" width="146">
 		<combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
 			Ask before sending
@@ -139,8 +150,8 @@
 			Never send
 		</combo_item>
 	</combo_box>
-	<combo_box allow_text_entry="true" bottom="-394" control_name="Language" enabled="true"
-	     follows="left|bottom" height="16" hidden="false" left="153" max_chars="135"
+	<combo_box allow_text_entry="true" bottom="-402" control_name="Language" enabled="true"
+	     follows="left|bottom" height="16" left="153" max_chars="135"
 	     mouse_opaque="true" name="language_combobox" width="146">
 		<combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
 			System Default
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
index ec2f4e9..71ba4bf 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
@@ -1,103 +1,372 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Graphics" left="102" mouse_opaque="true"
+     height="408" label="Graphics" left="102" mouse_opaque="true"
      name="Display panel" width="517">
-	<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|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="text" v_pad="0" width="128">
-		Display Resolution:
-	</text>
-     <check_box bottom="-26" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false" label="Run in a window"
-	     left="160" mouse_opaque="true" name="windowed mode" radio_style="false"
-	     width="256" />
-	     
-	     <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
+	<button bottom="-22" follows="left|top" font="SansSerif" height="18" label="?"
+	     left="470" name="GraphicsPreferencesHelpButton" width="22" />
+	<check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall"
+	     height="16" hidden="false" initial_value="false"
+	     label="Run Second Life in a window" left="10" mouse_opaque="true"
+	     name="windowed mode" radio_style="false" width="100" />
+	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
 	     embedded_items="false" enabled="false" follows="left|top"
 	     font="SansSerifSmall" height="20" hidden="false" hide_border="true"
-	     hide_scrollbar="true" left="160" max_length="65535"
-	     mouse_opaque="true" name="voice_chat_description" width="350" tab_stop="false"
-	     word_wrap="true">If unchecked viewer will display full screen when logged in.</text_editor>
-<!--	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-47" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
-	     left="160" mouse_opaque="true" name="full_screen_text" v_pad="0" width="256">
-		Viewer will display full screen when logged in.
-	</text> -->
-	<combo_box allow_text_entry="false" bottom="-67" enabled="false" follows="left|top"
-	     height="18" hidden="false" left="160" max_chars="20" mouse_opaque="true"
-	     name="fullscreen combo" width="160" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-87" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Fullscreen Aspect Ratio:" v_pad="0"
-	     width="150">
-		Fullscreen Aspect Ratio:
+	     hide_scrollbar="true" left="10" max_length="65535" mouse_opaque="true"
+	     name="FullScreenInfo" tab_stop="false" width="350" word_wrap="true">
+		If unchecked, viewer will display full-screen when logged in.
+	</text_editor>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-39" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+	     mouse_opaque="true" name="DisplayResLabel" v_pad="0" width="128">
+		Display Resolution:
 	</text>
+	<combo_box allow_text_entry="false" bottom="-44" enabled="true" follows="left|top"
+	     height="18" left="185" max_chars="20" mouse_opaque="true"
+	     name="fullscreen combo" width="150" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-102" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="(width / height)" v_pad="0" width="128">
-		(width / height)
+	     left="10" mouse_opaque="true" name="AspectRatioLabel1"
+	     tool_tip="width / height" v_pad="0" width="160">
+		Aspect Ratio:
 	</text>
-	<combo_box allow_text_entry="true" bottom="-91" enabled="true" follows="left|top"
-	     height="16" hidden="false" left="160" max_chars="100" mouse_opaque="true"
-	     name="aspect_ratio" width="160">
+	<combo_box allow_text_entry="true" bottom="-66" enabled="true" follows="left|top"
+	     height="16" left="185" max_chars="100" mouse_opaque="true"
+	     name="aspect_ratio" tool_tip="width / height" width="150">
 		<combo_item type="string" length="1" enabled="true" name="4:3(StandardCRT)" value="1.333333">
 			4:3 (Standard CRT)
 		</combo_item>
 		<combo_item type="string" length="1" enabled="true" name="5:4(1280x1024LCD)" value="1.25">
 			5:4 (1280x1024 LCD)
 		</combo_item>
+		<combo_item type="string" length="1" enabled="true" name="8:5(Widescreen)" value="1.6">
+			8:5 (Widescreen)
+		</combo_item>
 		<combo_item type="string" length="1" enabled="true" name="16:9(Widescreen)" value="1.7777777">
 			16:9 (Widescreen)
 		</combo_item>
 	</combo_box>
-	<check_box bottom="-110" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Auto detect" left="160" mouse_opaque="true"
+	<check_box bottom="-67" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Auto-detect ratio" left="358" mouse_opaque="true"
 	     name="aspect_auto_detect" radio_style="false" width="256" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-125" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
-		UI Size:
+	     left="10" mouse_opaque="true" name="HigherText" v_pad="0" width="80">
+		Quality and
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-14" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" hidden="false" left_delta="0" mouse_opaque="true"
+	     name="QualityText" v_pad="0" width="95">
+		Performance:
 	</text>
-	<slider bottom="-127" can_edit_text="true" control_name="UIScaleFactor"
-	     decimal_digits="3" enabled="true" height="16" hidden="false"
-	     increment="0.025" initial_val="1" left="160" max_val="1.4" min_val="0.75"
-	     mouse_opaque="true" name="UI Scale" show_text="true" value="1" width="256" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-163" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="222" mouse_opaque="true" name="(meters, lower is faster)" v_pad="0"
-	     width="180">
-		(meters, lower is faster)
+	     left="115" mouse_opaque="true" name="FasterText" v_pad="0" width="80">
+		Faster
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-191" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-105" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="text2" v_pad="0" width="128">
-		Display Options:
-	</text>
-	<check_box bottom="-148" control_name="UIAutoScale" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-	     label="Use resolution independent scale" left="160" mouse_opaque="true"
-	     name="ui_auto_scale" radio_style="false" width="256" />
-	<spinner bottom="-167" control_name="RenderFarClip" decimal_digits="0" enabled="true"
-	     follows="left|top" height="16" hidden="false" increment="32"
-	     initial_val="160" label="Draw Distance:" label_width="150" left="10"
-	     max_val="512" min_val="64" mouse_opaque="true" name="draw_distance"
-	     width="202" />
-	<check_box bottom="-195" control_name="FirstPersonAvatarVisible" enabled="true"
+	     left="158" mouse_opaque="true" name="ShadersPrefText" v_pad="0" width="40">
+		Low
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" hidden="false" left_delta="47" mouse_opaque="true"
+	     name="ShadersPrefText2" v_pad="0" width="40">
+		Mid
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" hidden="false" left_delta="47" mouse_opaque="true"
+	     name="ShadersPrefText3" v_pad="0" width="40">
+		High
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" hidden="false" left_delta="47" mouse_opaque="true"
+	     name="ShadersPrefText4" v_pad="0" width="40">
+		Ultra
+	</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="12" hidden="false"
+	     left="334" mouse_opaque="true" name="HigherText2" v_pad="0" width="80">
+		Higher
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-14" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" hidden="false" left_delta="0" mouse_opaque="true"
+	     name="QualityText2" v_pad="0" width="95">
+		Quality
+	</text>
+	<icon bottom="-89" color="0.12 0.12 0.12 1.0" height="14"
+	     image_name="rounded_square.tga" left="173" name="LowGraphicsDivet"
+	     width="2" />
+	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14"
+	     image_name="rounded_square.tga" left_delta="44" name="MidGraphicsDivet"
+	     width="2" />
+	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14"
+	     image_name="rounded_square.tga" left_delta="44" name="HighGraphicsDivet"
+	     width="2" />
+	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14"
+	     image_name="rounded_square.tga" left_delta="44" name="UltraGraphicsDivet"
+	     width="2" />
+	<slider bottom="-90" can_edit_text="false" control_name="RenderQualityPerformance"
+	     decimal_digits="0" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="1" initial_val="0" label="" label_width="0"
+	     left="165" max_val="3" min_val="0" mouse_opaque="true"
+	     name="QualityPerformanceSelection" show_text="false" width="150" />
+	<check_box bottom="-91" control_name="RenderCustomSettings" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+	     initial_value="true" label="Custom" left="385" mouse_opaque="true"
+	     name="CustomSettings" radio_style="false" width="256" />
+	<view_border bevel_style="none" border_thickness="1" bottom="-375" follows="top|left"
+	     height="260" left="5" name="GraphicsBorder" width="485" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="10" mouse_opaque="true" name="ShadersText" v_pad="0" width="128">
+		Shaders:
+	</text>
+	<check_box bottom="-153" control_name="RenderObjectBump" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+	     label="Bump Mapping and Shiny" left="10" mouse_opaque="true"
+	     name="BumpShiny" radio_style="false" width="256" />
+	<check_box bottom_delta="-17" control_name="VertexShaderEnable" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+	     initial_value="true" label="Basic Shaders" left_delta="0"
+	     mouse_opaque="true" name="BasicShaders" radio_style="false"
+	     tool_tip="Disabling this option may prevent some graphics card drivers from crashing."
+	     width="315" />
+	<check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Show Avatar in Mouselook" left="160"
-	     mouse_opaque="true" name="avfp" radio_style="false"
+	     initial_value="true" label="Atmospheric Shaders" left_delta="0"
+	     mouse_opaque="true" name="WindLightUseAtmosShaders" radio_style="false"
 	     width="256" />
-	<text hidden="true" name="resolution_format">
-		[RES_X] x [RES_Y]
+	<check_box bottom_delta="-17" control_name="RenderWaterReflections" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+	     initial_value="true" label="Water Reflections" left_delta="0"
+	     mouse_opaque="true" name="Reflections" radio_style="false" width="256" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-223" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
+	     width="128">
+		Reflection Detail:
 	</text>
-	<text hidden="true" name="aspect_ratio_text">
-		[NUM]:[DEN]
+	<radio_group bottom_delta="-73" control_name="RenderReflectionDetail" draw_border="false"
+	     enabled="true" follows="left|top" height="70" hidden="false"
+	     left_delta="-2" mouse_opaque="true" name="ReflectionDetailRadio"
+	     width="321">
+		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
+		     left="3" mouse_opaque="true" name="0" width="315">
+			Terrain and Trees
+		</radio_item>
+		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
+		     left="3" mouse_opaque="true" name="1" width="315">
+			All Static Objects
+		</radio_item>
+		<radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" hidden="false"
+		     left="3" mouse_opaque="true" name="2" width="315">
+			All Avatars and Objects
+		</radio_item>
+		<radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16" hidden="false"
+		     left="3" mouse_opaque="true" name="3" width="315">
+			Everything
+		</radio_item>
+	</radio_group>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-313" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+	     mouse_opaque="true" name="AvatarRenderingText" v_pad="0" width="128">
+		Avatar Rendering:
+	</text>
+	<check_box bottom_delta="-23" control_name="RenderUseImpostors" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+	     label="Avatar Impostors" left_delta="0" mouse_opaque="true"
+	     name="AvatarImpostors" radio_style="false" width="256" />
+	<check_box bottom_delta="-17" control_name="RenderAvatarVP" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+	     label="Hardware Skinning" left_delta="0" mouse_opaque="true"
+	     name="AvatarVertexProgram" radio_style="false" width="256" />
+	<check_box bottom_delta="-17" control_name="RenderAvatarCloth" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+	     label="Avatar Cloth" left_delta="0" mouse_opaque="true" name="AvatarCloth"
+	     radio_style="false" width="256" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="457" mouse_opaque="true" name="DrawDistanceMeterText1" v_pad="0"
+	     width="128">
+		m
 	</text>
-</panel>
\ No newline at end of file
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="463" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
+	     width="128">
+		m
+	</text>
+	<slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
+	     decimal_digits="0" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="8" initial_val="160" label="Draw Distance:"
+	     label_width="140" left="215" max_val="512" min_val="64" mouse_opaque="true"
+	     name="DrawDistance" show_text="true" width="255" />
+	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
+	     decimal_digits="0" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="256" initial_val="4096"
+	     label="Max. Particle Count:" label_width="140" left_delta="0"
+	     max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
+	     show_text="true" width="262" />
+	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderGlowResolutionPow"
+	     decimal_digits="0" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="1" initial_val="8" label="Post Process Quality:"
+	     label_width="140" left_delta="0" max_val="9" min_val="8"
+	     mouse_opaque="true" name="RenderPostProcess" show_text="false" width="223" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-17" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" left="215" mouse_opaque="true" name="MeshDetailText" v_pad="0"
+	     width="128">
+		Mesh Detail:
+	</text>
+	<slider bottom_delta="-22" can_edit_text="false" control_name="RenderVolumeLODFactor"
+	     decimal_digits="3" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="0.125" initial_val="160" label="  Objects:"
+	     label_width="140" left_delta="0" max_val="2" min_val="0"
+	     mouse_opaque="true" name="ObjectMeshDetail" show_text="false" width="223" />
+	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderFlexTimeFactor"
+	     decimal_digits="3" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="0.1" initial_val="160" label="  Flexiprims:"
+	     label_width="140" left_delta="0" max_val="1" min_val="0"
+	     mouse_opaque="true" name="FlexibleMeshDetail" show_text="false" width="223" />
+	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderTreeLODFactor"
+	     decimal_digits="3" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="0.125" initial_val="160" label="  Trees:"
+	     label_width="140" left_delta="0" max_val="1" min_val="0"
+	     mouse_opaque="true" name="TreeMeshDetail" show_text="false" width="223" />
+	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarLODFactor"
+	     decimal_digits="3" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="0.125" initial_val="160" label="  Avatars:"
+	     label_width="140" left_delta="0" max_val="1" min_val="0"
+	     mouse_opaque="true" name="AvatarMeshDetail" show_text="false" width="223" />
+	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderTerrainLODFactor"
+	     decimal_digits="3" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="0.125" initial_val="160" label="  Terrain:"
+	     label_width="140" left_delta="0" max_val="2" min_val="1"
+	     mouse_opaque="true" name="TerrainMeshDetail" show_text="false" width="223" />
+	<slider bottom_delta="-20" can_edit_text="false" control_name="WLSkyDetail"
+	     decimal_digits="0" enabled="true" follows="left|top" height="16"
+	     hidden="false" increment="8" initial_val="160" label="  Sky:"
+	     label_width="140" left_delta="0" max_val="128" min_val="16"
+	     mouse_opaque="true" name="SkyMeshDetail" show_text="false" width="223" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-172" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="444" mouse_opaque="true" name="PostProcessText" v_pad="0" width="128">
+		Low
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-210" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="444" mouse_opaque="true" name="ObjectMeshDetailText" v_pad="0"
+	     width="128">
+		Low
+	</text>
+	<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="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" hidden="false" left_delta="0" mouse_opaque="true"
+	     name="FlexibleMeshDetailText" v_pad="0" width="128">
+		Low
+	</text>
+	<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="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" hidden="false" left_delta="0" mouse_opaque="true"
+	     name="TreeMeshDetailText" v_pad="0" width="128">
+		Low
+	</text>
+	<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="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" hidden="false" left_delta="0" mouse_opaque="true"
+	     name="AvatarMeshDetailText" v_pad="0" width="128">
+		Low
+	</text>
+	<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="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" hidden="false" left_delta="0" mouse_opaque="true"
+	     name="TerrainMeshDetailText" v_pad="0" width="128">
+		Low
+	</text>
+	<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="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" hidden="false" left_delta="0" mouse_opaque="true"
+	     name="SkyMeshDetailText" v_pad="0" width="128">
+		Low
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="210" mouse_opaque="true" name="LightingDetailText" v_pad="0"
+	     width="128">
+		Lighting Detail:
+	</text>
+	<radio_group bottom_delta="-43" control_name="RenderLightingDetail" draw_border="false"
+	     enabled="true" follows="left|top" height="38" hidden="false" left_delta="0"
+	     mouse_opaque="true" name="LightingDetailRadio" width="321">
+		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
+		     left="3" mouse_opaque="true" name="SunMoon" width="156">
+			Sun and moon only
+		</radio_item>
+		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
+		     left="3" mouse_opaque="true" name="LocalLights" width="156">
+			Nearby local lights
+		</radio_item>
+	</radio_group>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="360"
+	     mouse_opaque="true" name="TerrainDetailText" v_pad="0" width="128">
+		Terrain Detail:
+	</text>
+	<radio_group bottom_delta="-43" control_name="RenderTerrainDetail" draw_border="false"
+	     enabled="true" follows="left|top" height="38" hidden="false" left_delta="0"
+	     mouse_opaque="true" name="TerrainDetailRadio" width="321">
+		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
+		     left="3" mouse_opaque="true" name="0" width="315">
+			Low
+		</radio_item>
+		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
+		     left="3" mouse_opaque="true" name="2" width="315">
+			High
+		</radio_item>
+	</radio_group>
+	<button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
+	     hidden="false" label="Recommended Settings" left="130" mouse_opaque="true"
+	     name="Defaults" scale_image="true" width="170" />
+	<button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
+	     hidden="false" label="Hardware Options" label_selected="Hardware Options"
+	     left="310" mouse_opaque="true" name="GraphicsHardwareButton"
+	     scale_image="true" width="170" />
+	<string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</string>
+	<string name="aspect_ratio_text">
+		[NUM]:[DEN]
+	</string>
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics2.xml
deleted file mode 100644
index 7b6a5eb..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Graphics Detail" left="102"
-     mouse_opaque="true" name="Display panel 3" width="517">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-23" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="text" v_pad="0" width="128">
-		Shaders:
-	</text>
-	<check_box bottom="-27" control_name="VertexShaderEnable" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-	     label="Enable Vertex Shaders" left="148"
-	     mouse_opaque="true" name="shaders" radio_style="false"
-	     tool_tip="Disabling this option may prevent some graphics card drivers from crashing."
-	     width="315" />
-	<check_box bottom="-46" control_name="RenderObjectBump" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-	     label="Enable Bumpmapping and Shiny" left="148" mouse_opaque="true"
-	     name="bumpshiny" radio_style="false" width="256" />
-	<check_box bottom="-65" control_name="RenderRippleWater" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-	     label="Enable Ripple Water" left="148" mouse_opaque="true" name="ripple"
-	     radio_style="false" width="256" />
-	<check_box bottom="-84" control_name="RenderAvatarVP" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-	     label="Avatar Vertex Program" left="148" mouse_opaque="true"
-	     name="avatarvp" radio_style="false" width="256" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-99" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Avatar Rendering:" v_pad="0"
-	     width="128">
-		Avatar Rendering:
-	</text>
-	<radio_group bottom="-141" control_name="RenderAvatarMode" draw_border="true" enabled="true"
-	     follows="left|top" height="54" hidden="false" left="148"
-	     mouse_opaque="true" name="Avatar Appearance" width="321">
-		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="Normal" width="315">
-			Normal
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="Bump" width="315">
-			Bump Mapped
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="Cloth" width="315">
-			Bump Mapped &amp; Cloth
-		</radio_item>
-	</radio_group>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-156" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Lighting Detail:" v_pad="0" width="128">
-		Lighting Detail:
-	</text>
-	<radio_group bottom="-182" control_name="RenderLightingDetail" draw_border="true"
-	     enabled="true" follows="left|top" height="38" hidden="false" left="148"
-	     mouse_opaque="true" name="lighting detail radio" width="321">
-		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="SunMoon" width="156">
-			Sun and moon only
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="LocalLights" width="156">
-			Nearby local lights
-		</radio_item>
-	</radio_group>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-197" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Terrain Detail:" v_pad="0" width="128">
-		Terrain Detail:
-	</text>
-	<radio_group bottom="-223" control_name="RenderTerrainDetail" draw_border="true"
-	     enabled="true" follows="left|top" height="38" hidden="false" left="148"
-	     mouse_opaque="true" name="terrain detail radio" width="321">
-		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="0" width="315">
-			Low
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="2" width="315">
-			High
-		</radio_item>
-	</radio_group>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-247" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Object Mesh Detail:" v_pad="0"
-	     width="135">
-		Object Mesh Detail:
-	</text>
-	<slider_bar bottom="-251" control_name="RenderVolumeLODFactor" enabled="true"
-	     follows="left|top" height="16" hidden="false" increment="0.125"
-	     initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
-	     name="Prim LOD Factor" width="128" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-266" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Flexible Mesh Detail:" v_pad="0"
-	     width="135">
-		Flexible Mesh Detail:
-	</text>
-	<slider_bar bottom="-270" control_name="RenderFlexTimeFactor" enabled="true"
-	     follows="left|top" height="16" hidden="false" increment="0.1"
-	     initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
-	     name="Flex Factor" width="128" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-285" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Tree Mesh Detail:" v_pad="0"
-	     width="128">
-		Tree Mesh Detail:
-	</text>
-	<slider_bar bottom="-289" control_name="RenderTreeLODFactor" enabled="true"
-	     follows="left|top" height="16" hidden="false" increment="0.125"
-	     initial_val="0.5" left="148" max_val="1" min_val="0" mouse_opaque="true"
-	     name="Tree LOD Factor" width="128" />
-	<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="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Avatar Mesh Detail:" v_pad="0"
-	     width="128">
-		Avatar Mesh Detail:
-	</text>
-	<slider_bar bottom="-308" control_name="RenderAvatarLODFactor" enabled="true"
-	     follows="left|top" height="16" hidden="false" increment="0.125"
-	     initial_val="0.5" left="148" max_val="1" min_val="0" mouse_opaque="true"
-	     name="Avatar LOD Factor" width="128" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
deleted file mode 100644
index 6bffb0a..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Adv. Graphics" left="102"
-     mouse_opaque="true" name="Display panel 2" width="517">
-	<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|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Filtering:" v_pad="0" width="128">
-		Filtering:
-	</text>
-	<check_box bottom="-26" control_name="RenderAnisotropic" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-	     label="Anisotropic Filtering (slower when enabled)" left="148"
-	     mouse_opaque="true" name="ani" radio_style="false" width="256" />
-	<spinner bottom="-45" control_name="RenderGamma" decimal_digits="2" enabled="true"
-	     follows="left|top" height="16" hidden="false" increment="0.01"
-	     initial_val="1" label="Gamma:" label_width="136" left="10" max_val="2"
-	     min_val="0.0" mouse_opaque="true" name="gamma" width="196" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-41" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="211" mouse_opaque="true" name="(brightness, lower is brighter)"
-	     v_pad="0" width="315">
-		(brightness, lower is brighter, 0=use default)
-	</text>
-	<spinner bottom="-64" control_name="RenderNightBrightness" decimal_digits="3"
-	     enabled="true" follows="left|top" height="16" hidden="false"
-	     increment="0.25" initial_val="1" label="Nighttime Brightness:"
-	     label_width="136" left="10" max_val="4" min_val="0" mouse_opaque="true"
-	     name="nighttime_brightness" width="196" />
-	<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="12" hidden="false"
-	     left="211" mouse_opaque="true" name="(higher is brighter, 1.0 is default)"
-	     v_pad="0" width="315">
-		(higher is brighter, 1.0 is default)
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-79" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Enable VBO:" v_pad="0"
-	     width="128">
-		Enable VBO:
-	</text>
-	<check_box bottom="-83" control_name="RenderVBOEnable" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-	     label="Enable OpenGL Vertex Buffer Objects" left="148"
-	     mouse_opaque="true" name="vbo" radio_style="false"
-	     tool_tip="Enabling this may cause some OpenGL drivers to crash."
-	     width="315" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-98" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="10" mouse_opaque="true" name="Graphics Card Memory:" v_pad="0"
-	     width="128">
-		Graphics Card Memory:
-	</text>
-	<radio_group bottom="-188" control_name="GraphicsCardMemorySetting" draw_border="true"
-	     enabled="true" follows="left|top" height="102" hidden="false" left="148"
-	     mouse_opaque="true" name="video card memory radio" width="221">
-		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="radio" width="315">
-			16MB
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="radio2" width="315">
-			32MB
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="radio3" width="315">
-			64MB
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="radio4" width="315">
-			128MB
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-83" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="radio5" width="315">
-			256MB
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-99" enabled="true" follows="left|top" height="16" hidden="false"
-		     left="3" mouse_opaque="true" name="radio6" width="315">
-			512MB
-		</radio_item>
-	</radio_group>
-	<spinner bottom="-207" control_name="RenderFogRatio" decimal_digits="1" enabled="true"
-	     follows="left|top" height="16" hidden="false" increment="0.1"
-	     initial_val="4" label="Fog Distance Ratio:" label_width="136" left="10"
-	     max_val="4" min_val="0.5" mouse_opaque="true" name="fog" width="196" />
-	<spinner bottom="-226" control_name="RenderMaxPartCount" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" hidden="false"
-	     increment="256" initial_val="4096" label="Max. Particle Count:"
-	     label_width="136" left="10" max_val="8192" min_val="0" mouse_opaque="true"
-	     name="particles" width="196" />
-	<spinner bottom="-245" control_name="AvatarCompositeLimit" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" hidden="false" increment="1"
-	     initial_val="5" label="Outfit Composite Limit:" label_width="136" left="10"
-	     max_val="100" min_val="0" mouse_opaque="true" name="comp limit"
-	     tool_tip="Number of recently changed outfits to display" width="196" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-241" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="211" mouse_opaque="true" name="(lower is faster)" v_pad="0"
-	     width="150">
-		(lower is faster)
-	</text>
-	<spinner bottom="-264" control_name="DebugBeaconLineWidth" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" hidden="false"
-	     increment="1" initial_val="8" label="Debug Beacon Line Width:"
-	     label_width="136" left="10" max_val="127" min_val="1" mouse_opaque="true"
-	     name="debug beacon line width" width="196" />
-	<check_box bottom="-304" control_name="ProbeHardwareOnStartup" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Auto-detect graphics hardware on next startup"
-	     left="148" mouse_opaque="true" name="probe_hardware_checkbox"
-	     radio_style="false"
-	     tool_tip="Second Life automatically configures some graphics settings based on your hardware.  If you install new hardware, you should have Second Life detect it again."
-	     width="270" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml
index af65d4d..493b153 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml
@@ -1,89 +1,87 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Communication" left="102"
-     mouse_opaque="true" name="im" width="517">
+     height="408" label="Communication" left="102" mouse_opaque="true" name="im"
+     width="517">
 	<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="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box" v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box" v_pad="0" width="128">
 		Profile Online Status:
 	</text>
 	<check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false"
-	     label="Make my online status visible only to my Friends and Groups" left="148" mouse_opaque="true"
-	     name="online_visibility" radio_style="false" width="350" />
+	     height="16" initial_value="false"
+	     label="Make my online status visible only to my Friends and Groups"
+	     left="148" mouse_opaque="true" name="online_visibility" radio_style="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="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box2" v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box2" v_pad="0" width="128">
 		IM Options:
 	</text>
-	<text hidden="true" name="log_in_to_change">
+	<string name="log_in_to_change">
 		log in to change
-	</text>
+	</string>
 	<check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" hidden="false" initial_value="false"
-	     label="Send IM to Email ([EMAIL])" left="148" mouse_opaque="true"
-	     name="send_im_to_email" radio_style="false" width="350" />
+	     height="16" initial_value="false" label="Send IM to Email ([EMAIL])"
+	     left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
+	     width="350" />
 	<check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Include IM in Chat History" left="148" mouse_opaque="true"
 	     name="include_im_in_chat_history" radio_style="false" width="237" />
 	<check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show timestamps in IM" left="148" mouse_opaque="true"
 	     name="show_timestamps_check" radio_style="false" width="237" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-105" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box3" v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box3" v_pad="0" width="128">
 		Busy Mode Response:
 	</text>
 	<text_editor type="string" length="1" bottom="-165" embedded_items="false" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="70" hidden="false" left="148"
-	     max_length="255" mouse_opaque="true" name="busy_response" width="330"
-	     word_wrap="true" />
+	     font="SansSerifSmall" height="70" left="148" max_length="255"
+	     mouse_opaque="true" name="busy_response" width="330" word_wrap="true" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-185" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box3" v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box4" v_pad="0" width="128">
 		Logging Options:
-	</text>	
+	</text>
 	<check_box bottom="-205" control_name="LogInstantMessages" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Log Instant Messages" left="148"
-	     mouse_opaque="true" name="log_instant_messages" radio_style="false"
-	     width="237" />
-	<check_box bottom="-225" control_name="IMLogTimestamp" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Show timestamps in IM Log" left="148"
-	     mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
-	     width="237" />
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Log Instant Messages" left="148" mouse_opaque="true"
+	     name="log_instant_messages" radio_style="false" width="237" />
+	<check_box bottom="-225" control_name="IMLogTimestamp" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Show timestamps in IM Log" left="148" mouse_opaque="true"
+	     name="log_instant_messages_timestamp" radio_style="false" width="237" />
 	<check_box bottom="-245" control_name="LogShowHistory" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show end of last IM conversation" left="148" mouse_opaque="true"
-	     name="log_show_history" radio_style="false" width="237" />	
+	     name="log_show_history" radio_style="false" width="237" />
 	<check_box bottom="-265" control_name="LogChat" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-	     label="Log Chat" left="148" mouse_opaque="true" name="log_chat"
-	     radio_style="false" width="237" />
+	     font="SansSerifSmall" height="16" initial_value="false" label="Log Chat"
+	     left="148" mouse_opaque="true" name="log_chat" radio_style="false"
+	     width="237" />
 	<check_box bottom="-285" control_name="LogChatTimestamp" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-	     label="Show timestamps in Chat Log" left="148" mouse_opaque="true" name="log_chat_timestamp"
-	     radio_style="false" width="237" />
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Show timestamps in Chat Log" left="148" mouse_opaque="true"
+	     name="log_chat_timestamp" radio_style="false" width="237" />
 	<check_box bottom="-305" control_name="LogChatIM" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-	     label="Show incoming IM in Chat Log" left="148" mouse_opaque="true" name="log_chat_IM"
-	     radio_style="false" width="237" />
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Show incoming IM in Chat Log" left="148" mouse_opaque="true"
+	     name="log_chat_IM" radio_style="false" width="237" />
 	<check_box bottom="-325" control_name="LogTimestampDate" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-	     label="Include Date with Timestamp" left="148" mouse_opaque="true" name="log_date_timestamp"
-	     radio_style="false" width="237" />
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Include Date with Timestamp" left="148" mouse_opaque="true"
+	     name="log_date_timestamp" radio_style="false" width="237" />
 	<button bottom="-347" follows="right|bottom" font="SansSerif" halign="center"
 	     height="20" label="Change Path" label_selected="Change Path" left="170"
 	     mouse_opaque="true" name="log_path_button" width="90" />
 	<line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-346"
 	     drop_shadow_visible="true" enabled="false" follows="top|left|right"
 	     font="SansSerifSmall" halign="right" height="19" left="248"
-	     max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />	
+	     max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml
index ac02fb6..982775b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml
@@ -1,68 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Input &amp; Camera" left="102"
-     mouse_opaque="true" name="Input panel" width="517">
+     height="408" label="Input &amp; Camera" left="102" mouse_opaque="true"
+     name="Input panel" width="517">
 	<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="10" hidden="false"
-	     left="10" mouse_opaque="true" name=" Mouselook Options:" v_pad="0"
-	     width="266">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="true" name=" Mouselook Options:" v_pad="0" width="266">
 		Mouselook Options:
 	</text>
 	<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="10" hidden="false"
-	     left="148" mouse_opaque="true" name=" Mouse Sensitivity:" v_pad="0"
-	     width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+	     mouse_opaque="true" name=" Mouse Sensitivity:" v_pad="0" width="128">
 		Mouse Sensitivity:
 	</text>
 	<slider_bar bottom="-26" control_name="MouseSensitivity" enabled="true" follows="left|top"
-	     height="16" hidden="false" increment="0.25" initial_val="2" left="276"
-	     max_val="15" min_val="0" mouse_opaque="true" name="Mouse Sensitivity"
-	     width="128" />
+	     height="16" increment="0.25" initial_val="2" left="276" max_val="15"
+	     min_val="0" mouse_opaque="true" name="Mouse Sensitivity" width="128" />
 	<check_box bottom="-44" control_name="InvertMouse" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" label="Invert Mouse"
-	     left="148" mouse_opaque="true" name="invert mouse" radio_style="false"
-	     width="128" />
+	     font="SansSerifSmall" height="16" label="Invert Mouse" left="148"
+	     mouse_opaque="true" name="invert mouse" radio_style="false" width="128" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-74" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="10" mouse_opaque="true" name=" Auto Fly Options:" v_pad="0"
-	     width="266">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="true" name=" Auto Fly Options:" v_pad="0" width="266">
 		Auto Fly Options:
 	</text>
 	<check_box bottom="-80" control_name="AutomaticFly" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false"
-	     label="Fly/land on holding up/down" left="148" mouse_opaque="true"
-	     name="automatic fly" radio_style="false" width="178" />
+	     font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
+	     left="148" mouse_opaque="true" name="automatic fly" radio_style="false"
+	     width="178" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-110" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="10" mouse_opaque="true" name=" Camera Options:" v_pad="0" width="266">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="true" name=" Camera Options:" v_pad="0" width="266">
 		Camera Options:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-110" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="148" mouse_opaque="true" name="Camera Springiness:" v_pad="0"
-	     width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+	     mouse_opaque="true" name="Camera Springiness:" v_pad="0" width="128">
 		Camera Springiness:
 	</text>
 	<slider bottom="-116" can_edit_text="true" control_name="DynamicCameraStrength"
 	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     hidden="false" increment="1" initial_val="2" left="276" max_val="10"
-	     min_val="0" mouse_opaque="true" name="dynamic camera" show_text="true"
-	     value="2" width="128" />
+	     increment="1" initial_val="2" left="276" max_val="10" min_val="0"
+	     mouse_opaque="true" name="dynamic camera" show_text="true" value="2"
+	     width="128" />
 	<check_box bottom="-134" control_name="EditCameraMovement" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Automatic Edit Camera Movement" left="148"
-	     mouse_opaque="true" name="edit camera movement" radio_style="false"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Automatic Edit Camera Movement" left="148" mouse_opaque="true"
+	     name="edit camera movement" radio_style="false"
 	     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
 	     width="201" />
 	<check_box bottom="-152" control_name="AppearanceCameraMovement" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Automatic Appearance Camera Movement"
-	     left="148" mouse_opaque="true" name="appearance camera movement"
-	     radio_style="false"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
+	     name="appearance camera movement" radio_style="false"
 	     tool_tip="Use automatic camera positioning while in edit mode" width="242" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-186" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="10" mouse_opaque="true" name="text2" v_pad="0" width="128">
+		Avatar Display Options:
+	</text>
+	<check_box bottom="-190" control_name="FirstPersonAvatarVisible" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+	     initial_value="false" label="Show Avatar in Mouselook" left="148"
+	     mouse_opaque="true" name="avfp" radio_style="false" width="256" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_network.xml
index ebe744e..6834ab5 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_network.xml
@@ -1,67 +1,67 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Network" left="102" mouse_opaque="true"
-     name="network" width="517">
-
+     height="408" label="Network" left="102" mouse_opaque="true" name="network"
+     width="517">
 	<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="10" hidden="false"
-	     left="12" mouse_opaque="false" name="text_box" v_pad="0" width="200">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box" v_pad="0" width="200">
 		Maximum Bandwidth:
 	</text>
-	<slider can_edit_text="true" control_name="ThrottleBandwidthKBPS"
+	<slider bottom_delta="-25" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
 	     decimal_digits="0" enabled="true" follows="left|top" height="15"
-	     hidden="false" increment="10" initial_val="50" max_val="1500"
-	     min_val="50" mouse_opaque="true" name="max_bandwidth" show_text="true"
-	     value="500" width="180" left_delta="0" bottom_delta="-25" />
+	     increment="10" initial_val="50" left_delta="0" max_val="1500" min_val="50"
+	     mouse_opaque="true" name="max_bandwidth" show_text="true" value="500"
+	     width="180" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     mouse_opaque="false" name="text_box2" v_pad="0" width="200" left_delta="186" bottom_delta="4">
+	     bottom_delta="4" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="10" left_delta="186" mouse_opaque="false" name="text_box2"
+	     v_pad="0" width="200">
 		kbps (kilobits per second)
 	</text>
-
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     mouse_opaque="false" name="cache_size_label_l" v_pad="0" width="200" left="12" bottom_delta="-25">
+	     bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="10" left="12" mouse_opaque="false" name="cache_size_label_l"
+	     v_pad="0" width="200">
 		Disk Cache Size (MB):
 	</text>
-	<slider can_edit_text="true" control_name="CacheSize" decimal_digits="0"
-	     enabled="true" follows="left|top" height="15" hidden="false" increment="10"
-	     initial_val="50" max_val="1000" min_val="10" mouse_opaque="true"
-	     name="cache_size" show_text="true" width="180" left_delta="0" bottom_delta="-25" />
-	<button bottom="-55" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="22" hidden="false"
-	     label="Clear Cache" left="340" mouse_opaque="true"
-	     name="clear_cache" scale_image="true" width="100" left_delta="186" bottom_delta="-4"/>
-
+	<slider bottom_delta="-25" can_edit_text="true" control_name="CacheSize"
+	     decimal_digits="0" enabled="true" follows="left|top" height="15"
+	     increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
+	     mouse_opaque="true" name="cache_size" show_text="true" width="180" />
+	<button bottom="-55" bottom_delta="-4" enabled="true" follows="left|bottom"
+	     font="SansSerif" halign="center" height="22" label="Clear Cache" left="340"
+	     left_delta="186" mouse_opaque="true" name="clear_cache" scale_image="true"
+	     width="100" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-70" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     mouse_opaque="false" name="cache_location_label" v_pad="0" width="200" left="12" bottom_delta="-17">
+	     bottom="-70" bottom_delta="-17" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="10" left="12" mouse_opaque="false" name="cache_location_label"
+	     v_pad="0" width="200">
 		Disk Cache Location:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" 
-	     enabled="false" follows="left|top" font="SansSerif" handle_edit_keys_directly="true"
-	     height="20" hidden="false" max_length="4096" mouse_opaque="true"
-	     name="cache_location" select_all_on_focus_received="false" width="470" word_wrap="false" left_delta="0" bottom_delta="-28"/>
-	<button enabled="true" follows="left|top" font="SansSerif"
-	     halign="center" height="22" hidden="false"
-	     label="Set" label_selected="Set" mouse_opaque="true"
-	     name="set_cache" scale_image="true" width="100" left_delta="0" bottom_delta="-25"/>
-	<button bottom="-105" enabled="true" follows="left|top" font="SansSerif"
-	     halign="center" height="22" hidden="false"
-	     label="Reset" label_selected="Set" mouse_opaque="true"
-	     name="reset_cache" scale_image="true" width="100" left_delta="103" bottom_delta="0"/>
-
-	<check_box bottom="-173" control_name="ConnectionPortEnabled" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" hidden="false" initial_value="false" label="Custom Port Connection"
-             mouse_opaque="true" name="connection_port_enabled" radio_style="false"
-             width="256" left="12" bottom_delta="-25"/> 
-	<spinner bottom="-193" control_name="ConnectionPort" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" hidden="false"
-	     increment="1" initial_val="13000" label="Port Number:"
-             label_width="75" max_val="13050" min_val="13000" mouse_opaque="true"
-             name="connection_port" width="150" left_delta="20" bottom_delta="-20"/>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28"
+	     enabled="false" follows="left|top" font="SansSerif"
+	     handle_edit_keys_directly="true" height="20" left_delta="0"
+	     max_length="4096" mouse_opaque="true" name="cache_location"
+	     select_all_on_focus_received="false" width="470" word_wrap="false" />
+	<button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
+	     halign="center" height="22" label="Set" label_selected="Set" left_delta="0"
+	     mouse_opaque="true" name="set_cache" scale_image="true" width="100" />
+	<button bottom="-105" bottom_delta="0" enabled="true" follows="left|top"
+	     font="SansSerif" halign="center" height="22" label="Reset"
+	     label_selected="Set" left_delta="103" mouse_opaque="true"
+	     name="reset_cache" scale_image="true" width="100" />
+	<check_box bottom="-173" bottom_delta="-25" control_name="ConnectionPortEnabled"
+	     enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Custom Port Connection" left="12"
+	     mouse_opaque="true" name="connection_port_enabled" radio_style="false"
+	     width="256" />
+	<spinner bottom="-193" bottom_delta="-20" control_name="ConnectionPort"
+	     decimal_digits="0" enabled="true" follows="left|top" height="16"
+	     increment="1" initial_val="13000" label="Port Number:" label_width="75"
+	     left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
+	     name="connection_port" width="150" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
index 5117c0f..8563ad0 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
@@ -11,33 +11,29 @@
 		Show popups:
 	</text>
 	<scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
-	     
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="15" mouse_opaque="false" name="text_box2" v_pad="0" width="270">
+	     bottom_delta="-30" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="10" left="15" mouse_opaque="false" name="text_box2" v_pad="0"
+	     width="270">
 		Offers of notecards, textures and landmarks:
 	</text>
 	<check_box bottom_delta="-25" control_name="AutoAcceptNewInventory" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Automatically accept"
-	     left="40" mouse_opaque="true" name="accept_new_inventory"
-	     radio_style="false"
-	     width="270" />
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Automatically accept" left="40" mouse_opaque="true"
+	     name="accept_new_inventory" radio_style="false" width="270" />
 	<check_box bottom_delta="-20" control_name="ShowNewInventory" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="true" label="Automatically view after accepting"
-	     left="40" mouse_opaque="true" name="show_new_inventory"
-	     radio_style="false"
-	     width="270" />
-
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+	     label="Automatically view after accepting" left="40" mouse_opaque="true"
+	     name="show_new_inventory" radio_style="false" width="270" />
 	<button bottom_delta="-35" follows="top|left" height="20"
 	     label="Show all &apos;Skip next time&apos; Dialogs..." left="15"
-	     name="reset_dialogs_btn" width="250" 
-	     tool_tip="Enable all of the optional popups and 'first time use' notifications."/>
-
+	     name="reset_dialogs_btn"
+	     tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications."
+	     width="250" />
 	<button bottom_delta="-24" follows="top|left" height="20"
 	     label="Skip all &apos;Skip next time&apos; Dialogs..." left="15"
-	     name="skip_dialogs_btn" width="250" 
-	     tool_tip="Disable all of the optional popups and 'first time use' notifications."/>
+	     name="skip_dialogs_btn"
+	     tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications."
+	     width="250" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
index e962eb4..720f1c4 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
@@ -1,93 +1,89 @@
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Voice Chat" left="102"
-     mouse_opaque="true" name="chat" width="517">
-	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26"
-	     embedded_items="false" enabled="false" follows="left|top"
-	     font="SansSerifSmall" height="20" hidden="false" hide_border="true"
-	     hide_scrollbar="true" left_delta="8" max_length="65535" mouse_opaque="true"
-	     name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
-		Voice Chat Is Not Available
-	</text_editor>
-	<check_box bottom_delta="0" control_name="EnableVoiceChat" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Enable voice chat" left="8"
-	     mouse_opaque="true" name="enable_voice_check" radio_style="false"
-	     width="200" />
-	<radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40"
-	     left_delta="20" name="ear_location" width="364">
-		<radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
-			Hear Voice Chat from camera position.
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">
-			Hear Voice Chat from avatar position.
-		</radio_item>
-	</radio_group>
-	<text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
-	     embedded_items="false" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" hide_border="true"
-	     hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
-	     name="push_to_talk_heading" width="445" word_wrap="true">
-		Push To Talk
-	</text>
-	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-60"
-	     embedded_items="false" enabled="false" follows="left|top"
-	     font="SansSerifSmall" height="65" hidden="false" hide_border="true"
-	     hide_scrollbar="true" left_delta="20" max_length="65535"
-	     mouse_opaque="true" name="voice_chat_description" tab_stop="false"
-	     width="450" word_wrap="true">
-		Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.
-	</text_editor>
-	<check_box bottom_delta="-20" control_name="EnablePushToTalk" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Start Viewer in Push-to-Talk mode"
-	     left_delta="0" mouse_opaque="true" name="push_to_talk_check"
-	     radio_style="false" width="200" />
-	<check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false" label="Use Push-to-Talk in toggle mode"
-	     left_delta="0" mouse_opaque="true" name="push_to_talk_toggle_check"
-	     radio_style="false" width="200" />
-	<text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
-	     embedded_items="false" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" hidden="false" hide_border="true"
-	     hide_scrollbar="true" left_delta="4" max_length="65535" mouse_opaque="true"
-	     name="push_to_talk_label" width="445" word_wrap="true">
-		Push-to-Talk trigger:
-	</text>
-	<line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"
-	     control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false"
-	     follows="top|left" font="SansSerifSmall" halign="right" height="19"
-	     left_delta="0" max_length="254" mouse_opaque="false" name="modifier_combo"
-	     width="280" />
-	<button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
-	     height="20" label="Set Key" left_delta="0" mouse_opaque="true"
-	     name="set_voice_hotkey_button" width="115" />
-	<button bottom_delta="0" follows="left" font="SansSerif" halign="center" height="20"
-	     label="Middle Mouse Button" left_delta="120" mouse_opaque="true"
-	     name="set_voice_middlemouse_button" width="160" />
-	<text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
-	     embedded_items="false" enabled="true" follows="left|top" height="16"
-	     hidden="false" left_delta="-120" name="privacy_heading" width="445">
-		Privacy Options
-	</text>
-	<check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-	     initial_value="false"
-	     label="Only accept voice calls from people on My Friends list"
-	     left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check"
-	     radio_style="false" width="200" />
-	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-40"
-	     embedded_items="false" enabled="false" follows="left|top"
-	     font="SansSerifSmall" height="35" hidden="false" hide_border="true"
-	     hide_scrollbar="true" left_delta="-20" max_length="65535"
-	     mouse_opaque="true" name="voice_chat_description" tab_stop="false"
-	     width="450" word_wrap="true">
-		NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.
-	</text_editor>
-	<button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
-	     label="Device Settings" left_delta="0" mouse_opaque="true"
-	     name="device_settings_btn" width="155" />
-	<button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
-	     label="Voice Chat Setup" left_delta="0" mouse_opaque="true"
-	     name="launch_voice_wizard_button" width="155" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+     height="408" label="Voice Chat" left="102" mouse_opaque="true" name="chat"
+     width="517">
+	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26"
+	     embedded_items="false" enabled="false" follows="left|top"
+	     font="SansSerifSmall" height="20" hide_border="true" hide_scrollbar="true"
+	     left_delta="8" max_length="65535" mouse_opaque="true"
+	     name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
+		Voice Chat Is Not Available
+	</text_editor>
+	<check_box bottom_delta="0" control_name="EnableVoiceChat" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Enable voice chat" left="8" mouse_opaque="true"
+	     name="enable_voice_check" radio_style="false" width="200" />
+	<radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40"
+	     left_delta="20" name="ear_location" width="364">
+		<radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
+			Hear Voice Chat from camera position.
+		</radio_item>
+		<radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">
+			Hear Voice Chat from avatar position.
+		</radio_item>
+	</radio_group>
+	<text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
+	     embedded_items="false" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true"
+	     left_delta="0" max_length="65535" mouse_opaque="true"
+	     name="push_to_talk_heading" width="445" word_wrap="true">
+		Push To Talk
+	</text>
+	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-60"
+	     embedded_items="false" enabled="false" follows="left|top"
+	     font="SansSerifSmall" height="65" hide_border="true" hide_scrollbar="true"
+	     left_delta="20" max_length="65535" mouse_opaque="true"
+	     name="voice_chat_description" tab_stop="false" width="450" word_wrap="true">
+		Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.
+	</text_editor>
+	<check_box bottom_delta="-20" control_name="EnablePushToTalk" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Start Viewer in Push-to-Talk mode" left_delta="0"
+	     mouse_opaque="true" name="push_to_talk_check" radio_style="false"
+	     width="200" />
+	<check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Use Push-to-Talk in toggle mode" left_delta="0" mouse_opaque="true"
+	     name="push_to_talk_toggle_check" radio_style="false" width="200" />
+	<text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
+	     embedded_items="false" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true"
+	     left_delta="4" max_length="65535" mouse_opaque="true"
+	     name="push_to_talk_label" width="445" word_wrap="true">
+		Push-to-Talk trigger:
+	</text>
+	<line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"
+	     control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false"
+	     follows="top|left" font="SansSerifSmall" halign="right" height="19"
+	     left_delta="0" max_length="254" mouse_opaque="false" name="modifier_combo"
+	     width="280" />
+	<button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Set Key" left_delta="0" mouse_opaque="true"
+	     name="set_voice_hotkey_button" width="115" />
+	<button bottom_delta="0" follows="left" font="SansSerif" halign="center" height="20"
+	     label="Middle Mouse Button" left_delta="120" mouse_opaque="true"
+	     name="set_voice_middlemouse_button" width="160" />
+	<text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
+	     embedded_items="false" enabled="true" follows="left|top" height="16"
+	     left_delta="-120" name="privacy_heading" width="445">
+		Privacy Options
+	</text>
+	<check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Only accept voice calls from people on My Friends list"
+	     left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check"
+	     radio_style="false" width="200" />
+	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-40"
+	     embedded_items="false" enabled="false" follows="left|top"
+	     font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true"
+	     left_delta="-20" max_length="65535" mouse_opaque="true"
+	     name="device_settings_text" tab_stop="false" width="450" word_wrap="true">
+		NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.
+	</text_editor>
+	<button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
+	     label="Device Settings" left_delta="0" mouse_opaque="true"
+	     name="device_settings_btn" width="155" />
+	<button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
+	     label="Voice Chat Setup" left_delta="0" mouse_opaque="true"
+	     name="launch_voice_wizard_button" width="155" />
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
index 160bace..a32ca56 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
@@ -1,53 +1,64 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Web" left="102" mouse_opaque="true"
-     name="web" width="517">
+     height="408" label="Web" left="102" mouse_opaque="true" name="web"
+     width="517">
+	<radio_group bottom="-45" draw_border="false" follows="top|left" height="40" left="12"
+	     name="use_external_browser"
+	     tool_tip="Use outside web browser for help, web links, etc. Not recommended if running full screen."
+	     width="480">
+		<radio_item bottom="-20" height="20" left="0" name="external" width="480">
+			Use external web browser (Firefox, Safari, Internet Explorer)
+		</radio_item>
+		<radio_item bottom="-40" height="20" left="0" name="internal" width="480">
+			Use built-in web browser
+		</radio_item>
+	</radio_group>
 	<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="10" hidden="false"
-	     left="12" mouse_opaque="false" name="cache_size_label_l" v_pad="0" width="128">
+	     bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="10" left="32" mouse_opaque="false" name="cache_size_label_l"
+	     v_pad="0" width="128">
 		Browser cache:
 	</text>
-	<button bottom="-30" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="22" hidden="false"
-	     label="Clear Now" left="140" mouse_opaque="true"
-	     name="clear_cache" scale_image="true" width="85" />
+	<button bottom_delta="-10" enabled="true" follows="left|bottom" font="SansSerif"
+	     halign="center" height="22" label="Clear Now" left="140"
+	     mouse_opaque="true" name="clear_cache" scale_image="true" width="85" />
 	<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="10" hidden="false"
-	     left="12" mouse_opaque="false" name="cookie_label" v_pad="0" width="128">
+	     bottom_delta="-30" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="10" left="66" mouse_opaque="false" name="cookie_label" v_pad="0"
+	     width="128">
 		Cookies:
 	</text>
-	<check_box bottom="-65" control_name="CookiesEnabled" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" hidden="false" initial_value="false" label="Accept cookies from sites"
-             left="140" mouse_opaque="true" name="cookies_enabled" radio_style="false"
-             width="256" /> 
-	<button bottom="-95" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="22" hidden="false"
-	     label="Clear Now" left="140" mouse_opaque="true"
-	     name="clear_cookies" scale_image="true" width="85" />
+	<check_box bottom_delta="-7" control_name="CookiesEnabled" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Accept cookies from sites" left="140" mouse_opaque="true"
+	     name="cookies_enabled" radio_style="false" width="256" />
 	<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="10" hidden="false"
-	     left="12" mouse_opaque="false" name="proxy_label" v_pad="0" width="128">
+	     bottom_delta="-24" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="10" left="55" mouse_opaque="false" name="proxy_label" v_pad="0"
+	     width="128">
 		Web Proxy:
 	</text>
-	<check_box bottom="-130" control_name="BrowserProxyEnabled" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" hidden="false" initial_value="false" label="Enable Web Proxy"
-             left="140" mouse_opaque="true" name="web_proxy_enabled" radio_style="false"
-             width="256" /> 
-	<text type="string" length="1" bottom="-150" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-	     left="140" mouse_opaque="false" name="proxy_text_label" v_pad="0" width="128">
+	<check_box bottom_delta="-7" control_name="BrowserProxyEnabled" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Enable Web Proxy" left="140" mouse_opaque="true"
+	     name="web_proxy_enabled" radio_style="false" width="256" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="10" left="140" mouse_opaque="false" name="proxy_text_label"
+	     v_pad="0" width="128">
 		Address:
 	</text>
-	<line_editor bottom="-156" enabled="true" follows="left|top" font="SansSerif"
-	     height="20" left="216" name="web_proxy_editor"	tool_tip="The name or IP address of the proxy you would like to use"
-	     width="140" />	              
-	<spinner bottom="-180" control_name="BrowserProxyPort" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" hidden="false"
-	     increment="1" initial_val="80" label="Port Number:"
-             label_width="75" left="140" max_val="12000" min_val="10" mouse_opaque="true"
-             name="web_proxy_port" width="140"/>
+	<line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+	     height="20" left="217" name="web_proxy_editor"
+	     tool_tip="The name or IP address of the proxy you would like to use"
+	     width="200" />
+	<spinner bottom_delta="-25" control_name="BrowserProxyPort" decimal_digits="0"
+	     enabled="true" follows="left|top" height="16" increment="1"
+	     initial_val="80" label="Port Number:" label_width="75" left="140"
+	     max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
+	     width="140" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
index f213c07..1c49932 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="top|left" height="320" label="Covenant" left="0" 
-	name="Covenant" width="480">
+<panel border="true" bottom="0" follows="top|left" height="320" label="Covenant"
+     left="0" name="Covenant" width="480">
 	<text bottom="-30" follows="left|top" font="SansSerifSmall" height="20" left="10"
 	     name="covenant_help_text" width="460">
 		Changes to the covenant information will show on all parcels in the estate.
@@ -42,32 +42,32 @@
 	     text_readonly_color="white" width="465">
 		Purchased land in this region may or may not be joined or subdivided.
 	</text>
-	   <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16"
+	<text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16"
 	     left_delta="0" name="covenent_instructions" width="465">
 		Drag and drop a notecard to change the Covenant for this Estate.
 	</text>
-        <text_editor bg_readonly_color="clear" bottom_delta="-242" enabled="false"
+	<text_editor bg_readonly_color="clear" bottom_delta="-242" enabled="false"
 	     follows="left|top" font="SansSerifSmall" height="238" left_delta="0"
 	     max_length="65535" name="covenant_editor" text_readonly_color="white"
 	     width="460" word_wrap="true">
 		Loading...
 	</text_editor>
-        <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
+	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
 	     left_delta="0" name="covenant_timestamp_text" width="300" />
 	<button bottom_delta="-4" follows="left|top" font="SansSerifSmall" height="18"
-	     label="Reset" right="470" name="reset_covenant" width="90" />
-        <text hidden="true" name="can_resell">
+	     label="Reset" name="reset_covenant" right="470" width="90" />
+	<string name="can_resell">
 		Purchased land in this region may be resold.
-	</text>
-	<text hidden="true" name="can_not_resell">
+	</string>
+	<string name="can_not_resell">
 		Purchased land in this region may not be resold.
-	</text>
-	<text hidden="true" name="can_change">
+	</string>
+	<string name="can_change">
 		Purchased land in this region may be joined or subdivided.
-	</text>
-	<text hidden="true" name="can_not_change">
+	</string>
+	<string name="can_not_change">
 		Purchased land in this region may not be joined or subdivided.
-	</text>
-        <button bottom="-24" follows="left|top" font="SansSerifSmall" height="18"
-	     label="?" right="470" name="covenant_help" width="18" />	
+	</string>
+	<button bottom="-24" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="covenant_help" right="470" width="18" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
index 9134e3f..4392888 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="top|left" height="320" label="Debug"
-     left="0" name="Debug" width="480">
+<panel border="true" bottom="0" follows="top|left" height="320" label="Debug" left="0"
+     name="Debug" width="480">
 	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
 	     name="region_text_lbl" width="100">
 		Region:
@@ -54,6 +54,6 @@
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
 	     left="150" name="restart_help" width="18" />
 	<button bottom_delta="-20" follows="left|top" height="20" label="Delay Restart"
-	     left="10" name="cancel_restart_btn" tool_tip="Delay region restart by one hour"
-	     width="130" />
+	     left="10" name="cancel_restart_btn"
+	     tool_tip="Delay region restart by one hour" width="130" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
index 4a75032..6132489 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="top|left" height="320" label="Estate" left="0" name="Estate" width="480">
+<panel border="true" bottom="0" follows="top|left" height="320" label="Estate"
+     left="0" name="Estate" width="480">
 	<text bottom="-46" follows="left|top" font="SansSerifSmall" height="32" left="10"
 	     name="estate_help_text" width="300">
 		Changes to settings on this tab will affect all
@@ -9,138 +10,135 @@ regions in the estate.
 	     name="estate_text" width="80">
 		Estate:
 	</text>
-	<text bg_readonly_color="clear" bottom_delta="-16" follows="left|top" font="SansSerif"
-	     height="20" left_delta="0" name="estate_name" text_readonly_color="white"
-	     width="150">
+	<text bg_readonly_color="clear" bottom_delta="-16" follows="left|top"
+	     font="SansSerif" height="20" left_delta="0" name="estate_name"
+	     text_readonly_color="white" width="150">
 		(unknown)
 	</text>
 	<text bottom_delta="-22" follows="left|top" font="SansSerif" height="20" left="10"
 	     name="owner_text" width="80">
 		Owner:
 	</text>
-	<text bg_readonly_color="clear" bottom_delta="-16" follows="left|top" font="SansSerif"
-	     height="20" left_delta="0" name="estate_owner" text_readonly_color="white"
-	     width="150">
+	<text bg_readonly_color="clear" bottom_delta="-16" follows="left|top"
+	     font="SansSerif" height="20" left_delta="0" name="estate_owner"
+	     text_readonly_color="white" width="150">
 		(unknown)
 	</text>
-	
-	<view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-265" follows="top|left"
-	     height="260" left="6" width="250" />
-            <check_box bottom_delta="235" follows="left|top" height="20" label="Use Global Time"
-                 left="12" name="use_global_time_check" width="200" />
-            <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                 right="250" name="use_global_time_help" width="18" />
-            <check_box bottom_delta="-20" follows="left|top" height="20" label="Fixed Sun" left="12"
-                 name="fixed_sun_check" width="100" />
-            <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                 right="250" name="fixed_sun_help" width="18" />
-            <icon bottom_delta="-25" follows="left|top" height="20"
-                 image_name="icon_day_cycle.tga" left="47" name="daycycle" width="165" />
-            <slider bottom_delta="-25" follows="left|top" height="20" increment="0.001"
-                 label="Phase" left="12" max_val="30" min_val="6" name="sun_hour_slider"
-                 show_text="false" width="200" />
-            <check_box bottom_delta="-26" follows="left|top" height="20" label="Allow Public Access"
-                 left="12" name="externally_visible_check" width="200" />
-            <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                 right="250" name="externally_visible_help" width="18" />
-	    <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" hidden="false"
-		 left="32" mouse_opaque="true" name="Only Allow"
-		 v_pad="0" width="278">
-	      Restrict Access To:
-	    </text>
-	    <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
-		 height="16" hidden="false" initial_value="false" label="Residents with payment info on file"
-		 left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false" width="278" 
-		 tool_tip="Ban unidentified residents."/>
-	    <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
-		 height="16" hidden="false" initial_value="false" label="Age-verified adults"
-		 left_delta="0" mouse_opaque="true" name="limit_age_verified" radio_style="false" width="278"
-		 tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."/>
-
-            <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Voice Chat"
-                 left="12" name="voice_chat_check" width="200" />
-            <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                 right="250" name="voice_chat_help" width="18" />
-    
-            <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Direct Teleport" left="12" name="allow_direct_teleport" width="80" />
-            <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                 right="250" name="allow_direct_teleport_help" width="18" />
-            <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
-                 right="250" name="apply_btn" width="90" />
-        
-        
-        <button bottom="-468" enabled="true" follows="left|top" height="20"
-	     label="Kick User from Estate..." left="8"
-	     name="kick_user_from_estate_btn" width="250" />
+	<view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
+	     follows="top|left" height="290" left="6" width="250" />
+	<check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time"
+	     left="12" name="use_global_time_check" width="200" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="use_global_time_help" right="250" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Fixed Sun" left="12"
+	     name="fixed_sun_check" width="100" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="fixed_sun_help" right="250" width="18" />
+	<icon bottom_delta="-25" follows="left|top" height="20"
+	     image_name="icon_day_cycle.tga" left="47" name="daycycle" width="165" />
+	<slider bottom_delta="-25" follows="left|top" height="20" increment="0.001"
+	     label="Phase" left="12" max_val="30" min_val="6" name="sun_hour_slider"
+	     show_text="false" width="200" />
+	<check_box bottom_delta="-26" follows="left|top" height="20" label="Allow Public Access"
+	     left="12" name="externally_visible_check" width="200" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="externally_visible_help" right="250" width="18" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+	     follows="top|left" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="16" left="32" mouse_opaque="true" name="Only Allow" v_pad="0"
+	     width="278">
+		Restrict Access To:
+	</text>
+	<check_box bottom_delta="-18" enabled="true" follows="top|left" font="SansSerifSmall"
+	     height="16" initial_value="false"
+	     label="Residents with payment info on file" left_delta="0"
+	     mouse_opaque="true" name="limit_payment" radio_style="false"
+	     tool_tip="Ban unidentified residents." width="278" />
+	<check_box bottom_delta="-18" enabled="true" follows="top|left" font="SansSerifSmall"
+	     height="16" initial_value="false" label="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" />
+	<check_box bottom_delta="-22" follows="left|top" height="20" label="Allow Voice Chat"
+	     left="12" name="voice_chat_check" width="200" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="voice_chat_help" right="250" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Direct Teleport"
+	     left="12" name="allow_direct_teleport" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="allow_direct_teleport_help" right="250" width="18" />
+	<text bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="20"
+	     left="10" name="abuse_email_text" width="180">
+		Abuse email address:
+	</text>
+	<line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254"
+	     name="abuse_email_address" width="205" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="abuse_email_address_help" right="250" width="18" />
+	<button bottom_delta="-26" enabled="false" follows="left|top" height="20" label="Apply"
+	     name="apply_btn" right="250" width="90" />
+	<button bottom="-468" enabled="true" follows="left|top" height="20"
+	     label="Kick User from Estate..." left="8" name="kick_user_from_estate_btn"
+	     width="250" />
 	<button bottom_delta="23" follows="left|top" height="20"
 	     label="Send Message To Estate..." left="8" name="message_estate_btn"
 	     width="250" />
-	
-	<!-- div -->
-        <!-- panel right="470" bottom="-119" border="false" border_thickness="0" width="200" height="94" -->
-            <text bottom="-34" follows="left|top" height="20" right="470" 
-                 name="estate_manager_label" width="200">
-                    Estate Managers:
-            </text>
-            <button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                 right="470" name="estate_manager_help" width="18" />
-            <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
-                right="470" width="200" />
-            <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
-                 name="estate_manager_name_list" width="200" />
-            <button bottom_delta="-26" enabled="true" follows="left|top" height="20" label="Remove..."
-                 right="470" name="remove_estate_manager_btn" width="90" />
-            <button bottom_delta="0" enabled="true" follows="left|top" height="20"
-                 label="Add..." left="270" name="add_estate_manager_btn" width="90" />
-
-            <text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
-                 name="allow_resident_label" width="200">
-                    Allowed Residents:
-            </text>
-            <button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                 right="470" name="allow_resident_help" width="18" />
-            <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
-                 height="60" right="470" width="200" />
-            <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
-                 name="allowed_avatar_name_list" width="200" />
-            <button bottom_delta="-26" enabled="true" follows="left|top" height="20" label="Remove..."
-                 right="470" name="remove_allowed_avatar_btn" width="90" />
-            <button bottom_delta="0" enabled="true" follows="left|top" height="20"
-                 label="Add..." left="270" name="add_allowed_avatar_btn" width="90" />
-        
-<text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
+	<text bottom="-34" follows="left|top" height="20" name="estate_manager_label"
+	     right="470" width="200">
+		Estate Managers:
+	</text>
+	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="estate_manager_help" right="470" width="18" />
+	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
+	     right="470" width="200" />
+	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
+	     name="estate_manager_name_list" width="200" />
+	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
+	     label="Remove..." name="remove_estate_manager_btn" right="470" width="90" />
+	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
+	     left="270" name="add_estate_manager_btn" width="90" />
+	<text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
+	     name="allow_resident_label" width="200">
+		Allowed Residents:
+	</text>
+	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="allow_resident_help" right="470" width="18" />
+	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
+	     height="60" right="470" width="200" />
+	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
+	     name="allowed_avatar_name_list" width="200" />
+	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
+	     label="Remove..." name="remove_allowed_avatar_btn" right="470" width="90" />
+	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
+	     left="270" name="add_allowed_avatar_btn" width="90" />
+	<text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
 	     name="allow_group_label" width="200">
 		Allowed Groups:
 	</text>
 	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     right="470" name="allow_group_help" width="18" />
+	     name="allow_group_help" right="470" width="18" />
 	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
 	     height="60" right="470" width="200" />
 	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
 	     name="allowed_group_name_list" width="200" />
-	<button bottom_delta="-26" enabled="true" follows="left|top" height="20" label="Remove..."
-	     right="470" name="remove_allowed_group_btn" width="90" />
-	<button bottom_delta="0" enabled="true" follows="left|top" height="20"
-	     label="Add..." left="270" name="add_allowed_group_btn" width="90" />
-
-
+	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
+	     label="Remove..." name="remove_allowed_group_btn" right="470" width="90" />
+	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
+	     left="270" name="add_allowed_group_btn" width="90" />
 	<text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
 	     name="ban_resident_label" width="200">
 		Banned Residents:
 	</text>
 	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     right="470" name="ban_resident_help" width="18" />
+	     name="ban_resident_help" right="470" width="18" />
 	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
 	     height="60" right="470" width="200" />
 	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
 	     name="banned_avatar_name_list" width="200" />
-	<button bottom_delta="-26" enabled="true" follows="left|top" height="20" label="Remove..."
-	     right="470" name="remove_banned_avatar_btn" width="90" />
-	<button bottom_delta="0" enabled="true" follows="left|top" height="20"
-	     label="Add..." left="270" name="add_banned_avatar_btn" width="90" />
-        
-
-        
+	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
+	     label="Remove..." name="remove_banned_avatar_btn" right="470" width="90" />
+	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
+	     left="270" name="add_banned_avatar_btn" width="90" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml b/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
index e02f1f6..f3074b8 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" follows="top|left" height="320" label="Region"
      left="0" name="General" width="480">
 	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
@@ -24,22 +25,22 @@
 	     left="10" name="restrict_pushobject" width="80" />
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
 	     left="205" name="restrict_pushobject_help" width="18" />
-	     
 	<check_box bottom_delta="-30" follows="left|top" height="20" label="Allow Land Resell"
 	     left="10" name="allow_land_resell_check" width="80" />
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
 	     left="205" name="land_resell_help" width="18" />
 	<check_box bottom_delta="-20" follows="left|top" height="20"
-	     label="Allow Land Join/Divide" left="10"
-	     name="allow_parcel_changes_check" width="80" />
+	     label="Allow Land Join/Divide" left="10" name="allow_parcel_changes_check"
+	     width="80" />
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
 	     left="205" name="parcel_changes_help" width="18" />
 	<check_box bottom_delta="-20" follows="left|top" height="20"
-	     label="Block Land Show in Search" left="10" tool_tip="Let people see this region and its parcels in
-search results" name="block_parcel_search_check" width="80" />
+	     label="Block Land Show in Search" left="10"
+	     name="block_parcel_search_check"
+	     tool_tip="Let people see this region and its parcels in search results"
+	     width="80" />
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
 	     left="205" name="parcel_search_help" width="18" />
-	     
 	<spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
 	     label="Agent Limit" label_width="97" left="10" max_val="100" min_val="0"
 	     name="agent_limit_spin" width="170" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml b/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml
index 0ef0c8e..30f5f6b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" follows="top|left" height="320" label="Terrain"
      left="0" name="Terrain" width="480">
 	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml b/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml
index 1c3d586..9b9a58b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" follows="top|left" height="320"
      label="Ground Textures" left="0" name="Textures" width="480">
 	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_scrolling_param.xml b/linden/indra/newview/skins/xui/en-us/panel_scrolling_param.xml
index 11dbcbe..b4281a2 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_scrolling_param.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" enabled="true" height="152" hidden="false" left="0"
-     mouse_opaque="true" name="LLScrollingPanelParam" width="270">
+<panel bottom="0" enabled="true" height="152" left="0" mouse_opaque="true"
+     name="LLScrollingPanelParam" width="270">
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-132" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="4" mouse_opaque="true" name="min param text" v_pad="0" width="128" />
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+	     mouse_opaque="true" name="min param text" v_pad="0" width="128" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-132" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="138" mouse_opaque="true" name="max param text" v_pad="0" width="128" />
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="138"
+	     mouse_opaque="true" name="max param text" v_pad="0" width="128" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="8" mouse_opaque="true" name="Loading..." v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="8"
+	     mouse_opaque="true" name="Loading..." v_pad="0" width="128">
 		Loading...
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-	     left="142" mouse_opaque="true" name="Loading...2" v_pad="0" width="128">
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="142"
+	     mouse_opaque="true" name="Loading...2" v_pad="0" width="128">
 		Loading...
 	</text>
 	<button bottom="-132" enabled="false" font="SansSerif" halign="center" height="132"
-	     hidden="false" image_disabled="square_btn_32x128.tga"
+	     image_disabled="square_btn_32x128.tga"
 	     image_disabled_selected="square_btn_selected_32x128.tga"
 	     image_selected="square_btn_selected_32x128.tga"
 	     image_unselected="square_btn_32x128.tga" label="" label_selected=""
-	     tab_stop="false"
-	     left="2" mouse_opaque="true" name="less" scale_image="true" width="132" />
+	     left="2" mouse_opaque="true" name="less" scale_image="true"
+	     tab_stop="false" width="132" />
 	<button bottom="-132" enabled="false" font="SansSerif" halign="center" height="132"
-	     hidden="false" image_disabled="square_btn_32x128.tga"
+	     image_disabled="square_btn_32x128.tga"
 	     image_disabled_selected="square_btn_selected_32x128.tga"
 	     image_selected="square_btn_selected_32x128.tga"
 	     image_unselected="square_btn_32x128.tga" label="" label_selected=""
-	     tab_stop="false"
-	     left="136" mouse_opaque="true" name="more" scale_image="true" width="132" />
+	     left="136" mouse_opaque="true" name="more" scale_image="true"
+	     tab_stop="false" width="132" />
 	<slider bottom="-150" can_edit_text="true" decimal_digits="0" enabled="false"
-	     height="16" hidden="false" increment="1" initial_val="0" label="[DESC]"
-	     label_width="100" left="6" max_val="100" min_val="0" mouse_opaque="true"
-	     name="param slider" show_text="true" value="0" width="258" />
+	     height="16" increment="1" initial_val="0" label="[DESC]" label_width="100"
+	     left="6" max_val="100" min_val="0" mouse_opaque="true" name="param slider"
+	     show_text="true" value="0" width="258" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
index dd89640..ec55c55 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
@@ -1,67 +1,70 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="active_speakers_panel" left="0" bottom="0" width="140" border="true" bevel_style="in" height="120" follows="left|bottom|right">
-	<string name="moderator_label">(Moderator)</string>
+<panel bevel_style="in" border="true" bottom="0" follows="left|bottom|right"
+     height="120" left="0" name="active_speakers_panel" width="140">
+	<string name="moderator_label">
+		(Moderator)
+	</string>
 	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="120" left="0"
 	     orientation="vertical" tab_group="1" width="140">
 		<layout_panel auto_resize="false" bottom="0" can_resize="false" height="25" left="0"
-		     min_height="25" name="moderation_mode_panel" top_delta="0" visible="false"
-		     width="140" user_resize="false">
-		     <combo_box follows="left|top|right|bottom" left="5" width="130" bottom="0" height="20" name="moderation_mode">
-				<combo_item value="unmoderated">Open Voice (default)</combo_item>
-				<combo_item value="moderated">Moderated Voice</combo_item>
-		     </combo_box>
+		     min_height="25" name="moderation_mode_panel" top_delta="0"
+		     user_resize="false" visible="false" width="140">
+			<combo_box bottom="0" follows="left|top|right|bottom" height="20" left="5"
+			     name="moderation_mode" width="130">
+				<combo_item name="OpenVoice" value="unmoderated">
+					Open Voice (default)
+				</combo_item>
+				<combo_item name="ModeratedVoice" value="moderated">
+					Moderated Voice
+				</combo_item>
+			</combo_box>
 		</layout_panel>
-
-		<layout_panel auto_resize="true" user_resize="false" bottom="0" can_resize="false" height="120" left="0"
-		     min_height="100" name="moderate_chat_panel" top_delta="0" visible="true"
-		     width="140">
+		<layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" left="0"
+		     min_height="100" name="moderate_chat_panel" top_delta="0"
+		     user_resize="false" visible="true" width="140">
 			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true"
-					draw_stripes="false" follows="left|top|bottom|right" left="0"
-					multi_select="false" name="speakers_list" right="140" search_column="1"
-					top="120" sort_column="2">
+			     draw_stripes="false" follows="left|top|bottom|right" left="0"
+			     multi_select="false" name="speakers_list" right="140" search_column="1"
+			     sort_column="2" top="120">
 				<column name="icon_speaking_status" sort="speaking_status" width="20" />
 				<column dynamicwidth="true" label="Name" name="speaker_name" />
 				<column label="" name="speaking_status" width="0" />
 			</scroll_list>
-
-			<panel name="speaker_controls" left="0" bottom="0" width="140" border="false" mouse_opaque="true" can_resize="false" height="77" follows="left|bottom|right">
-				<button left="0" right="30" bottom="-28" height="24" name="profile_btn" follows="left|top" label="" image_overlay="icon_avatar_offline.tga" enabled="false"/>
-				<text left_delta="34" bottom_delta="9" name="resident_name" valign="center" follows="left|top|right" width="140" font="SansSerif">Rumplstiltskin Califragilistic</text>
-				<volume_slider
-					name="speaker_volume"
-					left="5"
-					width="110"
-					bottom_delta="-29"
-					height="15"
-					follows="left|top"
-					min_val="0.0"
-					max_val="1.0"
-					increment="0.05"
-					initial_val="0.5"
-				/>
-				<button bottom_delta="0" height="20"
-					image_selected="icn_speaker-muted_dark.tga"
-					image_unselected="icn_speaker_dark.tga" label="" left_delta="110"
-					name="mute_btn" width="25" tool_tip="Mute voice for this resident"/>
-				<check_box
-					name="mute_text_btn"
-					width="50"
-					bottom_delta="-25"
-					left="4"
-					follows="left|top"
-					height="25"
-					enabled="false"
-					label="Mute Text"
-				/>
+			<panel border="false" bottom="0" can_resize="false" follows="left|bottom|right"
+			     height="77" left="0" mouse_opaque="true" name="speaker_controls"
+			     width="140">
+				<button bottom="-28" enabled="false" follows="left|top" height="24"
+				     image_overlay="icon_avatar_offline.tga" label="" left="0"
+				     name="profile_btn" right="30" />
+				<text bottom_delta="9" follows="left|top|right" font="SansSerif" left_delta="34"
+				     name="resident_name" valign="center" width="140">
+					Rumplstiltskin Califragilistic
+				</text>
+				<volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05"
+				     initial_val="0.5" left="5" max_val="1.0" min_val="0.0"
+				     name="speaker_volume" width="110" />
+				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
+				     image_unselected="icn_speaker_dark.tga" label="" left_delta="110"
+				     name="mute_btn" tool_tip="Mute voice for this resident" width="25" />
+				<check_box bottom_delta="-25" enabled="false" follows="left|top" height="25"
+				     label="Mute Text" left="4" name="mute_text_btn" width="50" />
 			</panel>
 		</layout_panel>
 		<layout_panel auto_resize="false" bottom="0" can_resize="false" height="60" left="0"
-		     name="moderator_controls" top_delta="0" visible="false"
-		     width="140" user_resize="false">
-		     <text left="5" bottom="-20" right="-5" height="20" follows="left|right|top|bottom" name="moderator_controls_label">Moderator Controls:</text>
-		     <check_box name="moderator_allow_voice" left_delta="0" bottom_delta="-16" height="20" right="-5" follows="left|right|top|bottom">Allow voice chat</check_box>
-		     <check_box name="moderator_allow_text" left_delta="0" bottom_delta="-20" height="20" right="-5" follows="left|right|top|bottom">Allow text chat</check_box>
+		     name="moderator_controls" top_delta="0" user_resize="false" visible="false"
+		     width="140">
+			<text bottom="-20" follows="left|right|top|bottom" height="20" left="5"
+			     name="moderator_controls_label" right="-5">
+				Moderator Controls:
+			</text>
+			<check_box bottom_delta="-16" follows="left|right|top|bottom" height="20" left_delta="0"
+			     name="moderator_allow_voice" right="-5">
+				Allow voice chat
+			</check_box>
+			<check_box bottom_delta="-20" follows="left|right|top|bottom" height="20" left_delta="0"
+			     name="moderator_allow_text" right="-5">
+				Allow text chat
+			</check_box>
 		</layout_panel>
-
 	</layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
index f4ec6e1..9f39fd6 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
@@ -1,143 +1,108 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" enabled="true" follows="top|left|right" height="18" hidden="false"
-     left="0" mouse_opaque="false" name="status" width="1000" background_opaque="true"
-     background_visible="true"
-     bg_opaque_color="0.25 0.25 0.25 1.0">
+<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" hidden="false" left="561" mouse_opaque="true"
+	     height="18" hover="true" left="561" mouse_opaque="true"
 	     name="ParcelNameText"
 	     tool_tip="Name of land parcel on which you are standing. Click for About Land."
-	     v_pad="2" width="1039" hover="true">
+	     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="0 1 0 1" drop_shadow_visible="true"
 	     enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-	     halign="right" height="18" hidden="false" left="-210" mouse_opaque="true"
+	     halign="right" height="18" left="-210" mouse_opaque="true"
 	     name="BalanceText" text_color="0 1 0 1" tool_tip="Account Balance"
 	     v_pad="2" width="76">
 		Loading...
 	</text>
 	<button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="16" hidden="false"
+	     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"
+	<text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-20" disabled_color="1 1 1 1" drop_shadow_visible="true"
 	     enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-	     halign="right" height="18" hidden="false" left="-300" mouse_opaque="true"
-	     name="TimeText" text_color="1 1 1 1" tool_tip="Current Time (Pacific)"
-	     v_pad="2" width="80">
+	     halign="right" height="18" left="-300" mouse_opaque="true" name="TimeText"
+	     text_color="1 1 1 1" 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
+		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" visible="false"
-	     image_selected="status_script_debug.tga"
+	     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" width="16" />
+	     tool_tip="Script Warnings and Errors" visible="false" width="16" />
 	<button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="18" visible="false"
-	     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" width="24" />
+	     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="1 1 1 1" drop_shadow_visible="true"
 	     enabled="true" follows="rsight|bottom" font="SansSerifSmall" h_pad="0"
-	     halign="left" height="18" visible="false" left="418" mouse_opaque="true"
-	     name="HealthText" text_color="1 1 1 1" tool_tip="Health" v_pad="2"
-	     width="31">
+	     halign="left" height="18" left="418" mouse_opaque="true" name="HealthText"
+	     text_color="1 1 1 1" 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" visible="false" image_selected="status_no_fly.tga"
+	     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"
-	     width="24" />
+	     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" visible="false"
-	     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" width="24" />
+	     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" visible="false"
-	     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" width="24" />
+	     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" visible="false" image_selected="status_no_push.tga"
+	     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="llPushObject restricted" width="24" />
+	     tool_tip="llPushObject restricted" visible="false" width="24" />
 	<button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="18" visible="false" 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" width="24" />
+	     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="-18" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="16" visible="false"
-	     image_selected="status_buy_land_pressed.tga"
+	     halign="center" height="16" image_selected="status_buy_land_pressed.tga"
 	     image_unselected="status_buy_land.tga" label="" label_selected=""
 	     left="569" mouse_opaque="true" name="buyland" scale_image="true"
-	     tool_tip="Buy this parcel" width="16" />
-
-  <!-- When the user hits return we spawn the search directory,
-       which makes this lose focus.  We don't want to commit twice.
-       commit_on_focus_lost must be false. JC -->
-  <line_editor bevel_style="in"
-               border_style="line"
-               border_thickness="1"
-               bottom="-18"
-               enabled="true"
-               follows="right|bottom"
-               font="SansSerif"
-               handle_edit_keys_directly="false"
-               commit_on_focus_lost="false"
-               height="20"
-               hidden="false"
-               label="Search"
-               left="-125"
-               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="104" />
-  <!-- *TODO: pressed state -->
-  <button bottom="-17"
-          enabled="true"
-          follows="right|bottom"
-          font="SansSerifSmall"
-          halign="center"
-          height="20"
-          hidden="false"
-          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="-20"
-          mouse_opaque="true"
-          name="search_btn"
-          tool_tip="Search Second Life"
-          width="20" />
-          
+	     tool_tip="Buy this parcel" visible="false" width="16" />
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-18"
+	     commit_on_focus_lost="false" enabled="true" follows="right|bottom"
+	     font="SansSerif" handle_edit_keys_directly="false" height="20"
+	     label="Search" left="-125" 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="104" />
+	<button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
+	     halign="center" height="20" 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="-20" mouse_opaque="true" name="search_btn"
+	     tool_tip="Search Second Life" width="20" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-17" enabled="false" follows="right|bottom" font="SansSerifSmall"
+	     halign="center" height="20" hidden="false" left="-20" mouse_opaque="true"
+	     name="stat_btn" width="20" />
 	<string name="packet_loss_tooltip">
 		Packet Loss
 	</string>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml b/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
index 1e53f89..da06c58 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
@@ -1,16 +1,17 @@
-<panel background_opaque="true" background_visible="true" can_close="true"
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel background_opaque="true" background_visible="true" bottom="0" can_close="true"
      can_minimize="false" can_resize="false" follows="left|right|bottom"
-     height="26" name="toolbar" width="1024" bottom="0">
-	<string name="Redock Windows">Redock Windows</string>
-	<button bottom="0" font="SansSerif" height="24"
-	     image_selected="btn_chatbar_selected.tga" scale_image="true"
+     height="26" name="toolbar" width="1024">
+	<string name="Redock Windows">
+		Redock Windows
+	</string>
+	<button bottom="0" font="SansSerif" height="24" image_overlay="icn_chatbar.tga"
+	     image_selected="btn_chatbar_selected.tga"
 	     image_unselected="btn_chatbar.tga" label="" left="0" name="chat_btn"
-	     image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
-	     width="50" />
+	     scale_image="true" tool_tip="Show Chat Bar. (Enter)" width="50" />
 	<flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
-	     name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
-	     list_position="above"
-	     width="50"/>
+	     list_position="above" name="communicate_btn"
+	     tool_tip="Communicate with your Friends and Groups." width="50" />
 	<button bottom="0" font="SansSerif" height="24" label="Fly"
 	     label_selected="Stop Flying" left="0" name="fly_btn"
 	     tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
index 7b70066..fa41dd4 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
@@ -1,5 +1,6 @@
+<?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" hidden="false" left="0"
+     enabled="true" follows="right|bottom" height="20" left="0"
      mouse_opaque="true" name="voice_controls" width="128">
 	<button bottom="-22" height="22" image_overlay="active_speakers.tga" label="" left="2"
 	     name="speakers_btn"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
index 02d5697..78447c5 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
@@ -1,98 +1,37 @@
-	<panel 
-		border="false" 
-		enabled="true" 
-		left="8" 
-		bottom="4"
-		mouse_opaque="true" 
-		name="content_panel" 
-		width="404"
-		height="240">
-
-		<text_editor 
-			name="voice_intro_text1" 
-			type="string" 
-			enabled="false" 
-			bg_readonly_color="0 0 0 0" 
-			font="SansSerifSmall" 
-			left_delta="0" 
-			width="400" 
-			height="85" 
-			length="1" 
-			max_length="65535"
-			hide_border="true"
-			hide_scrollbar="true" 
-			embedded_items="false" 
-			allow_html="false" 
-			mouse_opaque="true" 
-			tab_stop="false"
-			word_wrap="true">Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Using Voice Chat requires audio speakers and, if you wish to speak with others, a microphone or stereo headset with microphone.</text_editor>
-
-		<text_editor 
-			name="voice_intro_text2" 
-			type="string" 
-			enabled="false" 
-			bg_readonly_color="0 0 0 0" 
-			font="SansSerifSmall" 
-			left_delta="0" 
-			width="400" 
-			height="50" 
-			length="1" 
-			max_length="65535"
-			hide_border="true"
-			hide_scrollbar="true" 
-			embedded_items="false" 
-			allow_html="false" 
-			mouse_opaque="true" 
-			tab_stop="false"
-			word_wrap="true">Voice Chat is enabled by default. Do you wish to continue using Voice Chat?</text_editor>
-
-		<radio_group draw_border="false" enabled="true"
-			follows="left|top" height="40" left="10"
-			mouse_opaque="true" name="voice_enable" width="364" bottom_delta="-30">
-			<radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" 
-				left="3" name="1" width="315">
-				Yes, continue using Voice Chat.
-			</radio_item>
-			<radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" 
-				left="3" name="0" width="315">
-				No, disable Voice Chat.
-			</radio_item>
-		</radio_group>
-
-		<text_editor 
-			name="voice_intro_text3" 
-			enabled="false" 
-			bottom_delta="-50"
-			bg_readonly_color="0 0 0 0" 
-			font="SansSerifSmall" 
-			left="0" 
-			width="400" 
-			height="40" 
-			length="1" 
-			max_length="65535"
-			hide_border="true"
-			hide_scrollbar="true" 
-			embedded_items="false" 
-			allow_html="false" 
-			tab_stop="false"
-			word_wrap="true">You can enable Voice Chat at any time by going to the Voice Chat tab in Preferences.</text_editor>
-
-		<text_editor 
-			name="voice_intro_text4" 
-			enabled="false" 
-			bg_readonly_color="0 0 0 0" 
-			bottom_delta="0"
-			font="SansSerifSmall" 
-			left="0" 
-			width="400" 
-			height="40" 
-			length="1" 
-			max_length="65535"
-			hide_border="true"
-			hide_scrollbar="true" 
-			embedded_items="false" 
-			allow_html="false" 
-			tab_stop="false"
-			word_wrap="true">Click the Next button to configure Voice Chat preferences or click Finish to continue using Second Life.</text_editor>
-
-	</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" bottom="4" enabled="true" height="240" left="8"
+     mouse_opaque="true" name="content_panel" width="404">
+	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
+	     enabled="false" font="SansSerifSmall" height="85" hide_border="true"
+	     hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
+	     name="voice_intro_text1" tab_stop="false" width="400" word_wrap="true">
+		Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Using Voice Chat requires audio speakers and, if you wish to speak with others, a microphone or stereo headset with microphone.
+	</text_editor>
+	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
+	     enabled="false" font="SansSerifSmall" height="50" hide_border="true"
+	     hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
+	     name="voice_intro_text2" tab_stop="false" width="400" word_wrap="true">
+		Voice Chat is enabled by default. Do you wish to continue using Voice Chat?
+	</text_editor>
+	<radio_group bottom_delta="-30" draw_border="false" enabled="true" follows="left|top"
+	     height="40" left="10" mouse_opaque="true" name="voice_enable" width="364">
+		<radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="1" width="315">
+			Yes, continue using Voice Chat.
+		</radio_item>
+		<radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="0" width="315">
+			No, disable Voice Chat.
+		</radio_item>
+	</radio_group>
+	<text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-50"
+	     embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
+	     hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
+	     name="voice_intro_text3" tab_stop="false" width="400" word_wrap="true">
+		You can enable Voice Chat at any time by going to the Voice Chat tab in Preferences.
+	</text_editor>
+	<text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="0"
+	     embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
+	     hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
+	     name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true">
+		Click the Next button to configure Voice Chat preferences or click Finish to continue using Second Life.
+	</text_editor>
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
index b743088..1fb6b97 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" bottom="36" height="240" left="8" name="content_panel"
      width="404">
 	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
@@ -6,8 +7,8 @@
 	     name="voice_intro_text1" tab_stop="false" width="414" word_wrap="true">
 		Use the options below to configure your Voice Chat experience.
 	</text_editor>
-	<radio_group bottom_delta="-40" draw_border="false"
-	     follows="left|top" height="40" left="10" name="ear_location" width="364">
+	<radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40" left="10"
+	     name="ear_location" width="364">
 		<radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
 			Hear Voice Chat from camera position.
 		</radio_item>
@@ -18,7 +19,7 @@
 	<check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Only allow Friends to initiate Voice Calls with me" left="20"
-	     left_delta="2" name="push_to_talk_check" width="200" />
+	     left_delta="2" name="friends_only_check" width="200" />
 	<check_box bottom_delta="-20" control_name="EnablePushToTalk" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Start Viewer in Push-to-Talk mode" left_delta="0"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
index 3fd0dda..4569db0 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
@@ -1,6 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="1"
-     enabled="true" follows="right|bottom" height="20" hidden="false" left="0" use_bounding_rect="true"
-     mouse_opaque="true" name="voice_remote" width="128">
-	<panel filename="panel_bg_tab.xml" left="0" bottom="0" width="128" height="22"/>
-	<panel filename="panel_voice_controls.xml" left="0" bottom="0" width="127" height="20"/>
+     enabled="true" follows="right|bottom" height="20" left="0"
+     mouse_opaque="true" name="voice_remote" use_bounding_rect="true"
+     width="128">
+	<panel bottom="0" filename="panel_bg_tab.xml" height="22" left="0" width="128" />
+	<panel bottom="0" filename="panel_voice_controls.xml" height="20" left="0" width="127" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml
index 89a3196..27199d5 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml
@@ -1,18 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="1"
-     follows="right|bottom" height="45" hidden="false" left="0" use_bounding_rect="true"
-     mouse_opaque="true" name="voice_remote" width="128">
-   	<panel filename="panel_bg_tab.xml" left="0" bottom="0" width="128" height="47"/>
+     follows="right|bottom" height="45" left="0" mouse_opaque="true"
+     name="voice_remote" use_bounding_rect="true" width="128">
+	<panel bottom="0" filename="panel_bg_tab.xml" height="47" left="0" width="128" />
 	<button bottom="-23" height="22" image_overlay="icn_voice-call-end.tga" label=""
 	     left="2" name="end_call_btn" tool_tip="Click to hang up" width="24" />
-	<button bottom="-23" height="23" image_unselected="icn_rounded-text-field.tga" 
-		image_selected="icn_rounded-text-field.tga" image_hover_selected="icn_rounded-text-field.tga"
-		image_hover_unselected="icn_rounded-text-field.tga" image_disabled_selected="icn_rounded-text-field.tga" 
-		image_disabled="icn_rounded-text-field.tga" label="" scale_image="true"
-	     left_delta="26" name="voice_channel_bg" width="97" />
+	<button bottom="-23" height="23" image_disabled="icn_rounded-text-field.tga"
+	     image_disabled_selected="icn_rounded-text-field.tga"
+	     image_hover_selected="icn_rounded-text-field.tga"
+	     image_hover_unselected="icn_rounded-text-field.tga"
+	     image_selected="icn_rounded-text-field.tga"
+	     image_unselected="icn_rounded-text-field.tga" label="" left_delta="26"
+	     name="voice_channel_bg" scale_image="true" width="97" />
 	<icon bottom="-20" height="16" image_name="icn_voice-localchat.tga" label=""
-	     left_delta="7" name="voice_channel_icon" width="16" mouse_opaque="false"/>
+	     left_delta="7" mouse_opaque="false" name="voice_channel_icon" width="16" />
 	<text bottom="-21" font="SansSerifSmall" height="16" label="" left_delta="18"
 	     mouse_opaque="false" name="channel_label" text_color="0 0 0" width="65" />
 	<panel bottom_delta="-14" filename="panel_voice_controls.xml" left="0" />
 </panel>
-	
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/teleport_strings.xml b/linden/indra/newview/skins/xui/en-us/teleport_strings.xml
index feac150..4b3dfa4 100644
--- a/linden/indra/newview/skins/xui/en-us/teleport_strings.xml
+++ b/linden/indra/newview/skins/xui/en-us/teleport_strings.xml
@@ -2,89 +2,89 @@
 <teleport_messages>
 	<message_set name="errors">
 		<message name="invalid_tport">
-		    Problem encountered processing your teleport request. You may
+			Problem encountered processing your teleport request. You may
 need to log back in before you can teleport. If you continue
 to get	this message, please check the Tech Support FAQ at:
 www.secondlife.com/support
 		</message>
 		<message name="invalid_region_handoff">
-		    Problem encountered processing your region crossing. You may
+			Problem encountered processing your region crossing. You may
 need to log back in before you can cross regions. If you continue
 to get this message, please check the Tech Support FAQ at:
 www.secondlife.com/support.
 		</message>
 		<message name="blocked_tport">
-		    Sorry, teleport is currently blocked. Try again in a moment.
+			Sorry, teleport is currently blocked. Try again in a moment.
 If you still cannot teleport, please log out and log back in to
 resolve the problem.
 		</message>
 		<message name="nolandmark_tport">
-		    Sorry, but system was unable to locate landmark destination.
+			Sorry, but system was unable to locate landmark destination.
 		</message>
 		<message name="timeout_tport">
-		    Sorry, but system was unable to complete the teleport connection.
+			Sorry, but system was unable to complete the teleport connection.
 Try again in a moment.
 		</message>
 		<message name="noaccess_tport">
-		    Sorry, you do not have access to that teleport destination.
+			Sorry, you do not have access to that teleport destination.
 		</message>
 		<message name="missing_attach_tport">
-		    Your attachments have not arrived yet. Try waiting for a few
+			Your attachments have not arrived yet. Try waiting for a few
 more seconds or log out and back in again before attempting
 to teleport.
 		</message>
 		<message name="too_many_uploads_tport">
-		    The asset queue in this region is currently clogged so your teleport
+			The asset queue in this region is currently clogged so your teleport
 request will not be able to succeed in a timely manner. Please try again
 in a few minutes or go to a less busy area.
 		</message>
 		<message name="expired_tport">
-		    Sorry, but the system was unable to complete your teleport request
+			Sorry, but the system was unable to complete your teleport request
 in a timely fashion. Please try again in a few minutes.
 		</message>
 		<message name="expired_region_handoff">
-		    Sorry, but the system was unable to complete your region crossing
+			Sorry, but the system was unable to complete your region crossing
 in a timely fashion. Please try again in a few minutes.
 		</message>
 		<message name="no_host">
-		    Unable to find teleport destination. The destination may be
+			Unable to find teleport destination. The destination may be
 temporarily unavailable or no longer exists. Please try again
 in a few minutes.
 		</message>
 		<message name="no_inventory_host">
-		    The inventory system is currently unavailable.
+			The inventory system is currently unavailable.
 		</message>
 	</message_set>
-    <message_set name="progress">
-	    <message name="sending_dest">
-		    Sending to destination.
+	<message_set name="progress">
+		<message name="sending_dest">
+			Sending to destination.
 		</message>
 		<message name="redirecting">
-		    Redirecting to different location.
+			Redirecting to different location.
 		</message>
 		<message name="relaying">
-		    Relaying to destination.
+			Relaying to destination.
 		</message>
 		<message name="sending_home">
-		    Sending home location request.
+			Sending home location request.
 		</message>
 		<message name="sending_landmark">
-		    Sending landmark location request.
+			Sending landmark location request.
 		</message>
 		<message name="completing">
-		    Completing teleport.
+			Completing teleport.
 		</message>
 		<message name="resolving">
-		    Resolving destination.
+			Resolving destination.
 		</message>
 		<message name="contacting">
-		    Contacting new region.
+			Contacting new region.
 		</message>
 		<message name="arriving">
-		    Arriving...
+			Arriving...
 		</message>
 		<message name="requesting">
-		    Requesting Teleport...
+			Requesting Teleport...
 		</message>
 	</message_set>
 </teleport_messages>
diff --git a/linden/indra/newview/skins/xui/es/floater_html.xml b/linden/indra/newview/skins/xui/es/floater_html.xml
index 589b14c..7d84b59 100644
--- a/linden/indra/newview/skins/xui/es/floater_html.xml
+++ b/linden/indra/newview/skins/xui/es/floater_html.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="html" title="Navegador de internet">
+<floater name="htmlfloater" title="Navegador de internet">
 	<button label="Volver" name="back_btn" />
 	<button label="Avanzar" name="forward_btn" />
 	<button label="Recargar" name="reload_btn" />
@@ -9,4 +9,8 @@
 	<text name="status_text">
 		Texto de progreso va aquí
 	</text>
+	<text hidden="true" name="f1_help_title">Second Life Help</text>
+	<text hidden="true" name="f1_help_url">
+		http://secondlife.com/app/support/index_es.html
+	</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/fr/floater_html.xml b/linden/indra/newview/skins/xui/fr/floater_html.xml
index 06fa77f..ada5fd1 100644
--- a/linden/indra/newview/skins/xui/fr/floater_html.xml
+++ b/linden/indra/newview/skins/xui/fr/floater_html.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="html" title="Navigateur">
+<floater name="htmlfloater" title="Navigateur">
 	<button label="Retour" name="back_btn" />
 	<button label="Avancer" name="forward_btn" />
 	<button label="Recharger" name="reload_btn" />
@@ -9,4 +9,8 @@
 	<text name="status_text">
 		Texte de progression ici
 	</text>
+	<text hidden="true" name="f1_help_title">Second Life Help</text>
+	<text hidden="true" name="f1_help_url">
+		http://secondlife.com/app/support/index_fr.html
+	</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_html.xml b/linden/indra/newview/skins/xui/ja/floater_html.xml
index bc204a8..bc1078d 100644
--- a/linden/indra/newview/skins/xui/ja/floater_html.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_html.xml
@@ -8,16 +8,8 @@
 	<text name="home_page_url">
 		http://www.secondlife.com
 	</text>
-	<text name="in-world_help_title">
-		インワールド・ヘルプ：
-	</text>
-	<text name="in-world_help_url">
-		http://www.secondlife.com/app/support/inworld.html
-	</text>
-	<text name="additional_help_title">
-		追加ヘルプ
-	</text>
-	<text name="additional_help_url">
-		http://www.secondlife.com/app/support/support.html
+	<text hidden="true" name="f1_help_title">Second Life Help</text>
+	<text hidden="true" name="f1_help_url">
+		http://secondlife.com/app/support/index_ja.html
 	</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_html.xml b/linden/indra/newview/skins/xui/ko/floater_html.xml
index 4184704..408619d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_html.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_html.xml
@@ -8,16 +8,8 @@
 	<text name="home_page_url">
 		http://www.secondlife.com
 	</text>
-	<text name="in-world_help_title">
-		인월드 도움말
-	</text>
-	<text name="in-world_help_url">
-		http://www.secondlife.com/app/support/inworld.html
-	</text>
-	<text name="additional_help_title">
-		추가 도움말
-	</text>
-	<text name="additional_help_url">
-		http://www.secondlife.com/app/support/support.html
+	<text hidden="true" name="f1_help_title">Second Life Help</text>
+	<text hidden="true" name="f1_help_url">
+		http://secondlife.com/app/support/index_ko.html
 	</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/pt/floater_html.xml b/linden/indra/newview/skins/xui/pt/floater_html.xml
index a5c1e23..f8ba1e6 100644
--- a/linden/indra/newview/skins/xui/pt/floater_html.xml
+++ b/linden/indra/newview/skins/xui/pt/floater_html.xml
@@ -1,19 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="500" min_height="300" min_width="300" name="htmlfloater"
-     title="" width="700">
-	<button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20"
-	     label="Close" name="close_btn" right="-10" width="50" />
-	<web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
-	     name="html_floater_browser" right="-15" top="-30" />
-
-	<text hidden="true" name="in-world_help_title">Ajuda "In-World"</text>
-	<text hidden="true" name="in-world_help_url">
-		http://www.secondlifebrasil.com.br/app/inworld.aspx
+<floater name="htmlfloater" title="">
+	<text hidden="true" name="f1_help_title">Second Life Help</text>
+	<text hidden="true" name="f1_help_url">
+		http://secondlife.com/app/support/index_pt.html
 	</text>
-	
-	<text hidden="true" name="additional_help_title">Ajuda adicional</text>
-	<text hidden="true" name="additional_help_url">
-		http://www.secondlifebrasil.com.br/app/support.aspx
-	</text>
-</floater>
\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_html.xml b/linden/indra/newview/skins/xui/zh/floater_html.xml
index f253109..4cda56e 100644
--- a/linden/indra/newview/skins/xui/zh/floater_html.xml
+++ b/linden/indra/newview/skins/xui/zh/floater_html.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="html" title="网络浏览器">
+<floater name="htmlfloater" title="网络浏览器">
 	<button label="返回" name="back_btn" />
 	<button label="朝向" name="forward_btn" />
 	<button label="重载入" name="reload_btn" />
@@ -9,4 +9,8 @@
 	<text name="status_text">
 		过程文本传到这里
 	</text>
+	<text hidden="true" name="f1_help_title">Second Life Help</text>
+	<text hidden="true" name="f1_help_url">
+		http://secondlife.com/app/support/index_zh.html
+	</text>
 </floater>
-- 
cgit v1.1