From da34ca62889beb4b88d204e32e5db60e139beeb0 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 4 Dec 2008 15:09:42 -0700
Subject: Fixed localsim login url

---
 linden/indra/newview/llviewernetwork.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 5b423ff..c8cffcf 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -60,7 +60,7 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] =
 	{ "Local OpenSim",
 	  "",
 	  "localhost",
-	  "http://0.0.0.0:9000",
+	  "http://127.0.0.1:9000",
 	  "" },
 	{ "Other", "", "", "", "" }
 };
-- 
cgit v1.1


From 93eb46dcb67e35e99e3f68b4cb23ee9bf2fbb2d8 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 4 Dec 2008 15:09:52 -0700
Subject: Fixed localsim login url

---
 .../xui/en-us/floater_instant_message_group.xml    | 164 ++--
 linden/indra/newview/skins/silver/colors.xml       |   6 +-
 linden/indra/newview/skins/silver/colors_base.xml  | 376 ++++-----
 .../skins/silver/xui/en-us/panel_avatar.xml        | 860 ++++++++++-----------
 4 files changed, 703 insertions(+), 703 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index be18c7e..72c92bd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"
-     can_minimize="true" can_resize="true" default_tab_group="1" enabled="true"
-     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>
-	<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="live_help_dialog" wordwrap="false">
-		*** 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 -=-=-
-	</string>
-	<string name="title_string">
-		Instant Message with [NAME]
-	</string>
-	<string name="typing_start_string">
-		[NAME] is typing...
-	</string>
-	<string name="session_start_string">
-		Starting session with [NAME], please wait.
-	</string>
-	<string name="moderated_chat_label">
-		(Moderated: Voices off by default)
-	</string>
-	<string name="default_text_label">
-		Click here to instant message.
-	</string>
-	<string name="muted_text_label">
-		Your text chat has been disabled by a Group Moderator.
-	</string>
-	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"
-	     orientation="horizontal" tab_group="1" width="495" name="panels">
-		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
-		     height="130" left="0" min_width="210" name="im_contents_panel" width="175">
-			<button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
-			     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" 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="143" name="toggle_active_speakers_btn"
-			     right="176"
-			     tool_tip="Click here to toggle a list of active participants in this IM session."
-			     visible="true" width="30" />
-			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-			     bottom="30" embedded_items="false" enabled="false"
-			     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="104" width="170"
-			     word_wrap="true" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
-			     enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
-			     left="5" max_length="1022" mouse_opaque="true" name="chat_editor"
-			     select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-			     width="106" />
-			<button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"
-			     halign="center" height="20" label="Send" left="116" mouse_opaque="true"
-			     name="send_btn" scale_image="true" width="60" />
-		</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>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"
+     can_minimize="true" can_resize="true" default_tab_group="1" enabled="true"
+     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>
+	<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="live_help_dialog" wordwrap="false">
+		*** 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 -=-=-
+	</string>
+	<string name="title_string">
+		Instant Message with [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] is typing...
+	</string>
+	<string name="session_start_string">
+		Starting session with [NAME], please wait.
+	</string>
+	<string name="moderated_chat_label">
+		(Moderated: Voices off by default)
+	</string>
+	<string name="default_text_label">
+		Click here to instant message.
+	</string>
+	<string name="muted_text_label">
+		Your text chat has been disabled by a Group Moderator.
+	</string>
+	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"
+	     orientation="horizontal" tab_group="1" width="495" name="panels">
+		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
+		     height="130" left="0" min_width="210" name="im_contents_panel" width="175">
+			<button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
+			     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" 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="143" name="toggle_active_speakers_btn"
+			     right="176"
+			     tool_tip="Click here to toggle a list of active participants in this IM session."
+			     visible="true" width="30" />
+			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
+			     bottom="30" embedded_items="false" enabled="false"
+			     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="104" width="170"
+			     word_wrap="true" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
+			     enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
+			     left="5" max_length="1022" mouse_opaque="true" name="chat_editor"
+			     select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
+			     width="106" />
+			<button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"
+			     halign="center" height="20" label="Send" left="116" mouse_opaque="true"
+			     name="send_btn" scale_image="true" width="60" />
+		</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/silver/colors.xml b/linden/indra/newview/skins/silver/colors.xml
index 71a7787..cf9466f 100644
--- a/linden/indra/newview/skins/silver/colors.xml
+++ b/linden/indra/newview/skins/silver/colors.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings version = "101">
-</settings>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings version = "101">
+</settings>
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 19b6013..38db85c 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -1,188 +1,188 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings version = "101">
-
-<!-- WINDOWS -->
-<TitleBarFocusColor value="50, 115, 185, 120" />	<!-- Focused window title bar highlight, no equivalent for unfocused windows -->
-<FloaterFocusBorderColor value="50, 115, 185, 75" />
-<FloaterUnfocusBorderColor value="110, 110, 110, 60" />
-<FocusBackgroundColor value="165, 180, 200, 245" />	<!-- Background color of focused floaters -->
-<DefaultBackgroundColor value="165, 180, 200, 128" />	<!-- Background color for unfocused floaters -->
-<ColorDropShadow value="0, 0, 0, 200" />		<!-- The drop shadow behind windows and menus -->
-<DefaultHighlightDark value="50, 115, 185, 255" />
-<DefaultHighlightLight value="50, 115, 185, 255" />
-<DefaultShadowDark value="50, 115, 185, 255" />
-<DefaultShadowLight value="50, 115, 185, 255" />
-
-<!-- LABELS -->
-<LabelDisabledColor value="0, 30, 60, 128" />
-<LabelSelectedColor value="255, 255, 255, 255" />
-<LabelSelectedDisabledColor value="164, 190, 237, 128" />
-<LabelTextColor value="0, 30, 60, 255" />
-
-<!-- LOGIN -->
-<LoginProgressBarBgColor value="255, 255, 255, 255" />
-<LoginProgressBarFgColor value="255, 255, 255, 255" />
-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
-
-<!-- BUTTONS -->
-<ButtonLabelColor value="0, 30, 60, 255" /> 		<!-- Text labels for buttons, like the "OK" text -->
-<ButtonLabelSelectedColor value="255, 255, 255, 255" />
-<ButtonLabelDisabledColor value="0, 30, 60, 128" />
-<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" />
-<ButtonSelectedBgColor value="62, 62, 62, 255" />
-<ButtonSelectedColor value="255, 255, 255, 255" />
-<ButtonUnselectedBgColor value="62, 62, 62, 255" />
-<ButtonUnselectedFgColor value="255, 255, 255, 255" />
-<ButtonBorderColor value="239, 156, 0, 255" />
-<ButtonFlashBgColor value="255, 190, 62, 127" />
-<ButtonColor value="255, 255, 255, 255" /> 		<!-- Blended with button art, usually left as opaque white -->
-<ButtonImageColor value="255, 255, 255, 255" /> 	<!-- Blended with button art, usually left as opaque white -->
-
-<!-- SLIDERS -->
-<SliderDisabledThumbColor value="0, 0, 0, 255" />
-<SliderThumbCenterColor value="255, 255, 255, 255" />
-<SliderThumbOutlineColor value="37, 64, 99, 255" />
-<SliderTrackColor value="37, 64, 99, 255" />
-
-<!-- TEXTFIELDS -->
-<TextBgFocusColor value="255, 255, 255, 255" />		<!-- Text field background when receiving input (focused) -->
-<TextBgReadOnlyColor value="255, 255, 255, 140" />	<!-- Text field background when read-only -->
-<TextBgWriteableColor value="255, 255, 255, 255" />	<!-- Text field background when not receiving input (unfocused) -->
-<TextCursorColor value="0, 0, 0, 255" />
-<TextFgColor value="45, 48, 45, 255" />
-<TextFgReadOnlyColor value="0, 0, 0, 200" />
-<TextFgTentativeColor value="0, 0, 0, 128" />
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />	<!-- i.e. About Land name that you don't own -->
-<TextEmbeddedItemColor value="0, 0, 128, 255" />
-<TextDefaultColor value="0, 20, 0, 255"/>
-  
-<!-- LISTBOXES -->
-<ScrollBgReadOnlyColor value="255, 255, 255, 140" />
-<ScrollBgWriteableColor value="255, 255, 255, 140" />
-<ScrollBGStripeColor value="145, 180, 220, 60" />
-<ScrollDisabledColor value="128, 128, 128, 204" />
-<ScrollSelectedBGColor value="50, 115, 185, 150" />
-<ScrollSelectedFGColor value="0, 30, 60, 255" />	<!-- Text color -->
-<ScrollUnselectedColor value="0, 30, 60, 255" />	<!-- Text color -->
-<ScrollHighlightedColor value="145, 180, 220, 128" />	<!-- Hover color -->
-<ScrollbarThumbColor value="120, 160, 200, 255" />
-<ScrollbarTrackColor value="183, 202, 220, 255" />
-
-<!-- MENUS -->
-<MenuBarBgColor value="185, 200, 220, 230" />
-<MenuBarGodBgColor value="100, 200, 130, 230" />
-<MenuNonProductionGodBgColor value="100, 200, 130, 230" />
-<MenuNonProductionBgColor value="230, 70, 70, 230" />
-<MenuDefaultBgColor value="210, 220, 230, 245" />
-<MenuItemDisabledColor value="0, 30, 60, 128" />	<!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemEnabledColor value="0, 30, 60, 255" />		<!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemHighlightBgColor value="50, 115, 185, 100" />
-<MenuItemHighlightFgColor value="0, 30, 60, 255" />	<!-- Highlighted menu text color; also treeview node selection highlight -->
-<MenuPopupBgColor value="197, 217, 234, 240" />
-
-<!--  PIE MENUS -->
-<PieMenuBgColor value="118, 156, 201, 230" />
-<PieMenuLineColor value="255, 255, 255, 60" />
-<PieMenuSelectedColor value="185, 200, 220, 120" />
-
-<!-- TOOLTIPS -->
-<ToolTipBgColor value="250, 255, 225, 230" />
-<ToolTipBorderColor value="171, 212, 245, 255" />
-<ToolTipTextColor value="0, 0, 0, 255" />
-
-<!-- NOTIFICATION POP-UPS -->
-<NotifyBoxColor value="170, 210, 255, 240" />
-<NotifyTextColor value="0, 30, 60, 255" />
-<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
-<GroupNotifyBoxColor value="170, 210, 255, 240" />
-<GroupNotifyTextColor value="0, 30, 60, 255" />
-
-<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
-<ChatHistoryBgColor value="0, 30, 80, 200" />
-<ChatHistoryTextColor value="255, 255, 255, 255" />
-<IMHistoryBgColor value="0, 30, 80, 200" />
-<IMHistoryTextColor value="255, 255, 255, 255" />
-
-<!-- IN-WORLD SELECTION -->
-<SilhouetteParentColor value="255, 255, 0, 255" />
-<SilhouetteChildColor value="32, 106, 196, 255" />
-<HighlightParentColor value="171, 212, 245, 255" />
-<HighlightChildColor value="171, 212, 245, 255" />
-<HighlightInspectColor value="255, 0, 255, 255" />
-
-<!-- EDIT MODE GRID -->
-<GridFocusPointColor value="255, 255, 255, 128" />
-<GridlineColor value="255, 255, 255, 255" />
-<GridlineBGColor value="235, 235, 255, 200" />
-<GridlineShadowColor value="0, 0, 0, 80" />
-
-<!-- PROPERTY LINES -->
-<PropertyColorAvail value="0, 0, 0, 0" />
-<PropertyColorGroup value="0, 184, 184, 102" />
-<PropertyColorOther value="255, 0, 0, 102" />
-<PropertyColorSelf value="0, 255, 0, 102" />
-<PropertyColorForSale value="255, 128, 0, 102" />
-<PropertyColorAuction value="128, 0, 255, 102" />	<!-- Match the color on the world map -->
-
-<!-- Icon Enable/Disable -->
-<IconEnabledColor value="255, 255, 255, 255"/>
-<IconDisabledColor value="147, 169, 213, 200"/>
-
-<!-- MINI-MAP -->
-<NetMapBackgroundColor value="0, 0, 0, 77" />
-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
-
-<!-- HELP WINDOW -->
-<HelpBgColor value="200, 209, 204, 255" />
-<HelpFgColor value="0, 0, 0, 255" />
-<HelpScrollTrackColor value="0, 0, 0, 255" />
-<HelpScrollThumbColor value="255, 255, 255, 255" />
-<HelpScrollHighlightColor value="115, 132, 155, 255" />
-<HelpScrollShadowColor value="0, 0, 0, 255" />
-
-<!-- MISC -->
-<AvatarNameColor value="251, 175, 93, 255" /> 		<!-- Text color of avatar nametags -->
-<FocusColor value="239, 156, 0, 255" /> 		<!-- Color of the glow around UI controls with keyboard focus -->
-<FloaterButtonImageColor value="255, 255, 255, 255" /> 	<!-- The floater buttons (like the close box) are white images that receive this color. -->
-<ButtonCautionImageColor value="255, 255,  255, 255" />	<!-- Match the caution dialog buttons to the default -->
-<HealthTextColor value="255, 255, 255, 255" />
-<MapAutopilotColor value="255, 128, 0, 255" />
-<ContextSilhouetteColor value="239, 156, 0, 255" />	<!-- For "context" highlighting, i.e. pie menu -->
-<ScriptBgReadOnlyColor value="180, 180, 180, 255" />
-<ParcelTextColor value="40, 40, 90, 255" />		<!-- Parcel name on menu bar, normal state -->
-<ParcelHoverColor value="70, 70, 100, 255" />		<!-- Parcel name on menu bar, hover state -->
-<TimeTextColor value="0, 30, 60, 255" />		<!-- SL Time on menu bar -->
-<BalanceTextColor value="0, 100, 40, 255" />		<!-- Linden dollar balance on menu bar -->
-<HealthTextColor value="110, 15, 15, 255" />		<!-- Damage meter text on menu bar -->
-<GroupOverTierColor value="110, 15, 15, 255" />		<!-- Warning text in Group Info window -->
-<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Matching region of Inventory search text -->
-<FilterTextColor value="255, 200, 70, 255" />
-<InventoryItemSuffixColor value="120, 70, 55, 255"/>
-<InventorySearchStatusColor value="0, 0, 0, 255" />
-<ConsoleBackground value="0, 0, 0, 255" />
-<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
-<InventoryBackgroundColor value="255, 255, 255, 80"/>
-
- <!-- Alert box colors -->
-<AlertBoxColor value="165, 180, 200, 245"/>
-<AlertTextColor value="0, 30, 60, 255"/>
-<AlertCautionBoxColor value="254, 209, 118, 255"/>	<!-- Background color of caution alerts -->
-<AlertCautionTextColor value="0, 0, 0, 255"/>		<!-- Foreground color of the special title text in caution alerts -->
-
-<!--  Multi sliders, as in the sky animation setting -->
-<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
-<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
-<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
-<MultiSliderTrackColor value="30, 30, 30, 255"/>
-<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
-<MultiSliderTriangleColor value="255, 255, 50, 255"/>
-</settings>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings version = "101">
+
+<!-- WINDOWS -->
+<TitleBarFocusColor value="50, 115, 185, 120" />	<!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="50, 115, 185, 75" />
+<FloaterUnfocusBorderColor value="110, 110, 110, 60" />
+<FocusBackgroundColor value="165, 180, 200, 245" />	<!-- Background color of focused floaters -->
+<DefaultBackgroundColor value="165, 180, 200, 128" />	<!-- Background color for unfocused floaters -->
+<ColorDropShadow value="0, 0, 0, 200" />		<!-- The drop shadow behind windows and menus -->
+<DefaultHighlightDark value="50, 115, 185, 255" />
+<DefaultHighlightLight value="50, 115, 185, 255" />
+<DefaultShadowDark value="50, 115, 185, 255" />
+<DefaultShadowLight value="50, 115, 185, 255" />
+
+<!-- LABELS -->
+<LabelDisabledColor value="0, 30, 60, 128" />
+<LabelSelectedColor value="255, 255, 255, 255" />
+<LabelSelectedDisabledColor value="164, 190, 237, 128" />
+<LabelTextColor value="0, 30, 60, 255" />
+
+<!-- LOGIN -->
+<LoginProgressBarBgColor value="255, 255, 255, 255" />
+<LoginProgressBarFgColor value="255, 255, 255, 255" />
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
+
+<!-- BUTTONS -->
+<ButtonLabelColor value="0, 30, 60, 255" /> 		<!-- Text labels for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="255, 255, 255, 255" />
+<ButtonLabelDisabledColor value="0, 30, 60, 128" />
+<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" />
+<ButtonSelectedBgColor value="62, 62, 62, 255" />
+<ButtonSelectedColor value="255, 255, 255, 255" />
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />
+<ButtonBorderColor value="239, 156, 0, 255" />
+<ButtonFlashBgColor value="255, 190, 62, 127" />
+<ButtonColor value="255, 255, 255, 255" /> 		<!-- Blended with button art, usually left as opaque white -->
+<ButtonImageColor value="255, 255, 255, 255" /> 	<!-- Blended with button art, usually left as opaque white -->
+
+<!-- SLIDERS -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />
+<SliderThumbCenterColor value="255, 255, 255, 255" />
+<SliderThumbOutlineColor value="37, 64, 99, 255" />
+<SliderTrackColor value="37, 64, 99, 255" />
+
+<!-- TEXTFIELDS -->
+<TextBgFocusColor value="255, 255, 255, 255" />		<!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="255, 255, 255, 140" />	<!-- Text field background when read-only -->
+<TextBgWriteableColor value="255, 255, 255, 255" />	<!-- Text field background when not receiving input (unfocused) -->
+<TextCursorColor value="0, 0, 0, 255" />
+<TextFgColor value="45, 48, 45, 255" />
+<TextFgReadOnlyColor value="0, 0, 0, 200" />
+<TextFgTentativeColor value="0, 0, 0, 128" />
+<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />	<!-- i.e. About Land name that you don't own -->
+<TextEmbeddedItemColor value="0, 0, 128, 255" />
+<TextDefaultColor value="0, 20, 0, 255"/>
+  
+<!-- LISTBOXES -->
+<ScrollBgReadOnlyColor value="255, 255, 255, 140" />
+<ScrollBgWriteableColor value="255, 255, 255, 140" />
+<ScrollBGStripeColor value="145, 180, 220, 60" />
+<ScrollDisabledColor value="128, 128, 128, 204" />
+<ScrollSelectedBGColor value="50, 115, 185, 150" />
+<ScrollSelectedFGColor value="0, 30, 60, 255" />	<!-- Text color -->
+<ScrollUnselectedColor value="0, 30, 60, 255" />	<!-- Text color -->
+<ScrollHighlightedColor value="145, 180, 220, 128" />	<!-- Hover color -->
+<ScrollbarThumbColor value="120, 160, 200, 255" />
+<ScrollbarTrackColor value="183, 202, 220, 255" />
+
+<!-- MENUS -->
+<MenuBarBgColor value="185, 200, 220, 230" />
+<MenuBarGodBgColor value="100, 200, 130, 230" />
+<MenuNonProductionGodBgColor value="100, 200, 130, 230" />
+<MenuNonProductionBgColor value="230, 70, 70, 230" />
+<MenuDefaultBgColor value="210, 220, 230, 245" />
+<MenuItemDisabledColor value="0, 30, 60, 128" />	<!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemEnabledColor value="0, 30, 60, 255" />		<!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemHighlightBgColor value="50, 115, 185, 100" />
+<MenuItemHighlightFgColor value="0, 30, 60, 255" />	<!-- Highlighted menu text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="197, 217, 234, 240" />
+
+<!--  PIE MENUS -->
+<PieMenuBgColor value="118, 156, 201, 230" />
+<PieMenuLineColor value="255, 255, 255, 60" />
+<PieMenuSelectedColor value="185, 200, 220, 120" />
+
+<!-- TOOLTIPS -->
+<ToolTipBgColor value="250, 255, 225, 230" />
+<ToolTipBorderColor value="171, 212, 245, 255" />
+<ToolTipTextColor value="0, 0, 0, 255" />
+
+<!-- NOTIFICATION POP-UPS -->
+<NotifyBoxColor value="170, 210, 255, 240" />
+<NotifyTextColor value="0, 30, 60, 255" />
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="170, 210, 255, 240" />
+<GroupNotifyTextColor value="0, 30, 60, 255" />
+
+<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
+<ChatHistoryBgColor value="0, 30, 80, 200" />
+<ChatHistoryTextColor value="255, 255, 255, 255" />
+<IMHistoryBgColor value="0, 30, 80, 200" />
+<IMHistoryTextColor value="255, 255, 255, 255" />
+
+<!-- IN-WORLD SELECTION -->
+<SilhouetteParentColor value="255, 255, 0, 255" />
+<SilhouetteChildColor value="32, 106, 196, 255" />
+<HighlightParentColor value="171, 212, 245, 255" />
+<HighlightChildColor value="171, 212, 245, 255" />
+<HighlightInspectColor value="255, 0, 255, 255" />
+
+<!-- EDIT MODE GRID -->
+<GridFocusPointColor value="255, 255, 255, 128" />
+<GridlineColor value="255, 255, 255, 255" />
+<GridlineBGColor value="235, 235, 255, 200" />
+<GridlineShadowColor value="0, 0, 0, 80" />
+
+<!-- PROPERTY LINES -->
+<PropertyColorAvail value="0, 0, 0, 0" />
+<PropertyColorGroup value="0, 184, 184, 102" />
+<PropertyColorOther value="255, 0, 0, 102" />
+<PropertyColorSelf value="0, 255, 0, 102" />
+<PropertyColorForSale value="255, 128, 0, 102" />
+<PropertyColorAuction value="128, 0, 255, 102" />	<!-- Match the color on the world map -->
+
+<!-- Icon Enable/Disable -->
+<IconEnabledColor value="255, 255, 255, 255"/>
+<IconDisabledColor value="147, 169, 213, 200"/>
+
+<!-- MINI-MAP -->
+<NetMapBackgroundColor value="0, 0, 0, 77" />
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
+
+<!-- HELP WINDOW -->
+<HelpBgColor value="200, 209, 204, 255" />
+<HelpFgColor value="0, 0, 0, 255" />
+<HelpScrollTrackColor value="0, 0, 0, 255" />
+<HelpScrollThumbColor value="255, 255, 255, 255" />
+<HelpScrollHighlightColor value="115, 132, 155, 255" />
+<HelpScrollShadowColor value="0, 0, 0, 255" />
+
+<!-- MISC -->
+<AvatarNameColor value="251, 175, 93, 255" /> 		<!-- Text color of avatar nametags -->
+<FocusColor value="239, 156, 0, 255" /> 		<!-- Color of the glow around UI controls with keyboard focus -->
+<FloaterButtonImageColor value="255, 255, 255, 255" /> 	<!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255,  255, 255" />	<!-- Match the caution dialog buttons to the default -->
+<HealthTextColor value="255, 255, 255, 255" />
+<MapAutopilotColor value="255, 128, 0, 255" />
+<ContextSilhouetteColor value="239, 156, 0, 255" />	<!-- For "context" highlighting, i.e. pie menu -->
+<ScriptBgReadOnlyColor value="180, 180, 180, 255" />
+<ParcelTextColor value="40, 40, 90, 255" />		<!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="70, 70, 100, 255" />		<!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="0, 30, 60, 255" />		<!-- SL Time on menu bar -->
+<BalanceTextColor value="0, 100, 40, 255" />		<!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="110, 15, 15, 255" />		<!-- Damage meter text on menu bar -->
+<GroupOverTierColor value="110, 15, 15, 255" />		<!-- Warning text in Group Info window -->
+<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Matching region of Inventory search text -->
+<FilterTextColor value="255, 200, 70, 255" />
+<InventoryItemSuffixColor value="120, 70, 55, 255"/>
+<InventorySearchStatusColor value="0, 0, 0, 255" />
+<ConsoleBackground value="0, 0, 0, 255" />
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
+<InventoryBackgroundColor value="255, 255, 255, 80"/>
+
+ <!-- Alert box colors -->
+<AlertBoxColor value="165, 180, 200, 245"/>
+<AlertTextColor value="0, 30, 60, 255"/>
+<AlertCautionBoxColor value="254, 209, 118, 255"/>	<!-- Background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255"/>		<!-- Foreground color of the special title text in caution alerts -->
+
+<!--  Multi sliders, as in the sky animation setting -->
+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
+<MultiSliderTrackColor value="30, 30, 30, 255"/>
+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
+<MultiSliderTriangleColor value="255, 255, 50, 255"/>
+</settings>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
index d564ac9..62738dc 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
@@ -1,430 +1,430 @@
-<?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="419">
-		<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">
-			<string name="CaptionTextAcctInfo">
-				[ACCTTYPE]
-[PAYMENTINFO]
-[AGEVERIFICATION]
-			</string>
-			<string name="AcctTypeResident">
-				Resident
-			</string>
-			<string name="AcctTypeTrial">
-				Trial
-			</string>
-			<string name="AcctTypeCharterMember">
-				Charter Member
-			</string>
-			<string name="AcctTypeEmployee">
-				Linden Lab Employee
-			</string>
-			<string name="PaymentInfoUsed">
-				Payment Info Used
-			</string>
-			<string name="PaymentInfoOnFile">
-				Payment Info On File
-			</string>
-			<string name="NoPaymentInfoOnFile">
-				No Payment Info On File
-			</string>
-			<string name="AgeVerified">
-				Age-verified
-			</string>
-			<string name="NotAgeVerified">
-				Not Age-verified
-			</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"
-			     mouse_opaque="true" name="Name:" v_pad="0" width="70">
-				Name:
-			</text>
-			<name_editor bevel_style="in" border_style="line"
-			     border_thickness="1" bottom="-24" enabled="false" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
-			     max_length="254" mouse_opaque="false" name="name"
-			     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="16" left="279"
-			     mouse_opaque="true" name="online_yes" v_pad="0" width="121">
-				Currently Online
-			</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" left="279"
-			     mouse_opaque="true" name="label" v_pad="0" width="121">
-				Born:
-			</text>
-			<line_editor bevel_style="in" border_style="line"
-			     border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left="279"
-			     max_length="254" mouse_opaque="false" name="born"
-			     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"
-			     mouse_opaque="true" name="label2" v_pad="0" width="121">
-				Account:
-			</text>
-			<view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
-			     mouse_opaque="false" name="acct_border" width="121" />
-			<text bg_visible="false" border_drop_shadow_visible="false"
-			     border_visible="true" bottom_delta="0" drop_shadow_visible="true"
-			     follows="left|top" font="SansSerifSmall" height="48" left="279"
-			     mouse_opaque="false" name="acct" 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"
-			     mouse_opaque="true" name="partner_label"
-			     tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-			     v_pad="0" width="130">
-				Partner:
-			</text>
-			<button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"
-			     height="16" label="i" label_selected="i" left_delta="44"
-			     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="16" label="?" label_selected="?" left_delta="24"
-			     mouse_opaque="true" name="partner_help" width="18" />
-			<line_editor bevel_style="in" border_style="line"
-			     border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left="279"
-			     max_length="254" mouse_opaque="false" name="partner_edit"
-			     tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-			     width="121">
-				[FIRST] [LAST]
-			</line_editor>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-44" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-			     mouse_opaque="true" name="Photo:" v_pad="0" width="70">
-				Photo:
-			</text>
-			<texture_picker allow_no_texture="true" bottom="-179" can_apply_immediately="false"
-			     default_image_name="None" follows="left|top" height="151" label=""
-			     left="79" mouse_opaque="true" name="img"
-			     tool_tip="Click to choose a picture" width="180" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-183" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-			     mouse_opaque="true" name="Groups:" v_pad="0" width="70">
-				Groups:
-			</text>
-			<scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true"
-			     follows="left|top" height="90" left="79" mouse_opaque="false"
-			     multi_select="false" name="groups" width="321" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-280" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-			     mouse_opaque="true" name="About:" v_pad="0" width="70">
-				About:
-			</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="right" height="16" left="0"
-			     mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">
-				(500 chars)
-			</text>
-			<text_editor bottom="-375" embedded_items="false"
-			     enabled="true" follows="left|top" font="SansSerifSmall" height="110"
-			     is_unicode="false" left="79" max_length="511" mouse_opaque="true"
-			     name="about" width="321" word_wrap="true" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-403" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-			     mouse_opaque="true" name="Give item:" v_pad="0" width="75">
-				Give item:
-			</text>
-			<view_border blevel_style="in" border_thickness="0" bottom="-466" follows="left|top"
-			     height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"
-			     width="409" />
-			<view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="75"
-			     mouse_opaque="false" name="drop_target_rect_vis" width="321" />
-			<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="center" height="16" left_delta="0"
-			     mouse_opaque="true" name="Give inventory"
-			     tool_tip="Drop inventory items here to give them to this person." v_pad="2"
-			     width="321">
-				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" />
-			<button bottom="-423" follows="left|top" font="SansSerif" halign="center" height="16"
-			     label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"
-			     width="20" />
-			<button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"
-			     label_selected="Find on Map" left="24" mouse_opaque="true"
-			     name="Find on Map" width="100" />
-			<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_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..."
-			     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" />
-		</panel>
-		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-		     label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
-		  <line_editor bevel_style="in" border_style="line"
-			     border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left="10"
-			     max_length="254" mouse_opaque="true" name="url_edit"
-			     width="400" />
-			<flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="18" label="Load" label_selected="Load" left="10"
-			     mouse_opaque="true" name="load" enabled="false" 
-			     tool_tip="Load this profile page with embedded web browser." width="80" >
-				<flyout_button_item value="open" name="open_item">In external browser</flyout_button_item>
-				<flyout_button_item value="home" name="home_item">Home URL</flyout_button_item>
-			</flyout_button>
-			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-			     height="18" label="?" label_selected="?" left_delta="85"
-			     mouse_opaque="true" name="web_profile_help" width="18" />
-			<check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Automatically load web profiles"
-			     left_delta="30" mouse_opaque="true" name="auto_load"
-			     tool_tip="Automatically load ALL profile webpages without asking first."
-			     width="127" />
-			<web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
-			     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" />
-		</panel>
-		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-		     label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
-			<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="right" height="16" left="4"
-			     mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
-				I Want To:
-			</text>
-			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Build" left_delta="70" mouse_opaque="true"
-			     name="chk0" width="90" />
-			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"
-			     name="chk1" width="90" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Meet" left_delta="-170" mouse_opaque="true"
-			     name="chk2" width="57" />
-			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Be Hired" left_delta="170" mouse_opaque="true"
-			     name="chk6" width="92" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Group" left_delta="-170" mouse_opaque="true"
-			     name="chk3" width="90" />
-			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Buy" left_delta="170" mouse_opaque="true"
-			     name="chk4" width="90" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Sell" left_delta="-170" mouse_opaque="true"
-			     name="chk5" width="50" />
-			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
-			     name="chk7" width="92" />
-			<line_editor bevel_style="in" border_style="line"
-			     border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left="74"
-			     max_length="254" mouse_opaque="true" name="want_to_edit"
-			     width="330" />
-			<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="right" height="16" left="4"
-			     mouse_opaque="true" name="Skills:" v_pad="0" width="70">
-				Skills:
-			</text>
-			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Textures" left_delta="70" mouse_opaque="true"
-			     name="schk0" width="90" />
-			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Architecture" left_delta="170"
-			     mouse_opaque="true" name="schk1" width="93" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     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" />
-			<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" />
-			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Custom Characters" left_delta="170"
-			     mouse_opaque="true" name="schk5" width="127" />
-			<line_editor bevel_style="in" border_style="line"
-			     border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left="74"
-			     max_length="254" mouse_opaque="true" name="skills_edit"
-			     width="330" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-			     mouse_opaque="true" name="Languages:" v_pad="0" width="70">
-				Languages:
-			</text>
-			<line_editor bevel_style="in" border_style="line"
-			     border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left="74"
-			     max_length="254" mouse_opaque="true" name="languages_edit"
-			     width="330" />
-		</panel>
-		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-		     label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">
-			<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="16" left="114"
-			     mouse_opaque="true"
-			     name="Tell everyone about your favorite places in Second Life." v_pad="0"
-			     width="302">
-				Tell everyone about your favorite places in Second Life.
-			</text>
-			<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-			     height="20" label="New..." label_selected="New..." left="114"
-			     mouse_opaque="true" name="New..." width="75" />
-			<button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Delete..." label_selected="Delete..." left_delta="79"
-			     mouse_opaque="true" name="Delete..." width="75" />
-			<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...
-			</text>
-		</panel>
-		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-		     label="Classified" left="1" mouse_opaque="true" name="Classified"
-		     width="418">
-			<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="16" left="114"
-			     mouse_opaque="true"
-			     name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
-			     width="302">
-				Place an ad in Second Life&apos;s classified listings.
-			</text>
-			<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-			     height="20" label="New..." label_selected="New..." left="114"
-			     mouse_opaque="true" name="New..." width="75" />
-			<button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Delete..." label_selected="Delete..." left_delta="79"
-			     mouse_opaque="true" name="Delete..." width="75" />
-			<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...
-			</text>
-		</panel>
-		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-		     label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
-			<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="right" height="16" left="4"
-			     mouse_opaque="true" name="Photo:" v_pad="0" width="61">
-				Photo:
-			</text>
-			<texture_picker allow_no_texture="true" bottom="-171" can_apply_immediately="false"
-			     default_image_name="None" follows="left|top" height="151" label=""
-			     left="70" mouse_opaque="true" name="img"
-			     tool_tip="Click to choose a picture" width="135" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-203" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-			     mouse_opaque="true" name="Info:" v_pad="0" width="61">
-				Info:
-			</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="right" height="16" left="0"
-			     mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">
-				(250 chars)
-			</text>
-			<text_editor bottom="-347" embedded_items="false"
-			     enabled="true" follows="left|top" font="SansSerifSmall" height="160"
-			     is_unicode="false" left="70" max_length="254" mouse_opaque="false"
-			     name="about" width="330" word_wrap="true" />
-		</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"
-			     mouse_opaque="true" name="label" v_pad="0" width="412">
-				Use this space to record your notes about this person.  Keep track
-of trades in progress, joint projects, etc.  Only you can see these
-notes.  This person cannot see them, nor can other people.
-			</text>
-			<text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
-			     font="SansSerif" height="256" is_unicode="false" left="10"
-			     max_length="1023" mouse_opaque="true" name="notes edit" width="400"
-			     word_wrap="false" />
-		</panel>
-	</tab_container>
-	<button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"
-	     label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />
-	<button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
-	     label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
-	     width="100" />
-	<button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick"
-	     label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
-	<button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze"
-	     label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze"
-	     tool_tip="Stop this resident&apos;s movement and chat." width="72" />
-	<button bottom_delta="-24" font="SansSerif" halign="center" height="20"
-	     label="Unfreeze" label_selected="Unfreeze" left="4" mouse_opaque="true"
-	     name="Unfreeze" tool_tip="Thaw resident" width="72" />
-	<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" />
-	<string name="ShowOnMapNonFriend">
-		Show location on the map.
-Disabled because you have not
-formed a friendship with them.
-	</string>
-	<string name="ShowOnMapFriendOffline">
-		Show location on the map.
-    Disabled because they are not online.
-	</string>
-	<string name="ShowOnMapFriendOnline">
-		Show location on the map.
-	</string>
-	<string name="TeleportGod">
-		Force a teleport to your location.
-	</string>
-	<string name="TeleportPrelude">
-		Offer a teleport to your location.
-Disabled until you leave Orientation Island.
-	</string>
-	<string name="TeleportNormal">
-		Offer a teleport to your location.
-	</string>
-	<string name="Loading">
-		Loading...
-	</string>
-</panel>
+<?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="419">
+		<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">
+			<string name="CaptionTextAcctInfo">
+				[ACCTTYPE]
+[PAYMENTINFO]
+[AGEVERIFICATION]
+			</string>
+			<string name="AcctTypeResident">
+				Resident
+			</string>
+			<string name="AcctTypeTrial">
+				Trial
+			</string>
+			<string name="AcctTypeCharterMember">
+				Charter Member
+			</string>
+			<string name="AcctTypeEmployee">
+				Linden Lab Employee
+			</string>
+			<string name="PaymentInfoUsed">
+				Payment Info Used
+			</string>
+			<string name="PaymentInfoOnFile">
+				Payment Info On File
+			</string>
+			<string name="NoPaymentInfoOnFile">
+				No Payment Info On File
+			</string>
+			<string name="AgeVerified">
+				Age-verified
+			</string>
+			<string name="NotAgeVerified">
+				Not Age-verified
+			</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"
+			     mouse_opaque="true" name="Name:" v_pad="0" width="70">
+				Name:
+			</text>
+			<name_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom="-24" enabled="false" follows="left|top"
+			     font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
+			     max_length="254" mouse_opaque="false" name="name"
+			     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="16" left="279"
+			     mouse_opaque="true" name="online_yes" v_pad="0" width="121">
+				Currently Online
+			</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" left="279"
+			     mouse_opaque="true" name="label" v_pad="0" width="121">
+				Born:
+			</text>
+			<line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
+			     font="SansSerifSmall" height="16" is_unicode="false" left="279"
+			     max_length="254" mouse_opaque="false" name="born"
+			     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"
+			     mouse_opaque="true" name="label2" v_pad="0" width="121">
+				Account:
+			</text>
+			<view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
+			     mouse_opaque="false" name="acct_border" width="121" />
+			<text bg_visible="false" border_drop_shadow_visible="false"
+			     border_visible="true" bottom_delta="0" drop_shadow_visible="true"
+			     follows="left|top" font="SansSerifSmall" height="48" left="279"
+			     mouse_opaque="false" name="acct" 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"
+			     mouse_opaque="true" name="partner_label"
+			     tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
+			     v_pad="0" width="130">
+				Partner:
+			</text>
+			<button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"
+			     height="16" label="i" label_selected="i" left_delta="44"
+			     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="16" label="?" label_selected="?" left_delta="24"
+			     mouse_opaque="true" name="partner_help" width="18" />
+			<line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
+			     font="SansSerifSmall" height="16" is_unicode="false" left="279"
+			     max_length="254" mouse_opaque="false" name="partner_edit"
+			     tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
+			     width="121">
+				[FIRST] [LAST]
+			</line_editor>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-44" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+			     mouse_opaque="true" name="Photo:" v_pad="0" width="70">
+				Photo:
+			</text>
+			<texture_picker allow_no_texture="true" bottom="-179" can_apply_immediately="false"
+			     default_image_name="None" follows="left|top" height="151" label=""
+			     left="79" mouse_opaque="true" name="img"
+			     tool_tip="Click to choose a picture" width="180" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-183" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+			     mouse_opaque="true" name="Groups:" v_pad="0" width="70">
+				Groups:
+			</text>
+			<scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true"
+			     follows="left|top" height="90" left="79" mouse_opaque="false"
+			     multi_select="false" name="groups" width="321" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-280" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+			     mouse_opaque="true" name="About:" v_pad="0" width="70">
+				About:
+			</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="right" height="16" left="0"
+			     mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">
+				(500 chars)
+			</text>
+			<text_editor bottom="-375" embedded_items="false"
+			     enabled="true" follows="left|top" font="SansSerifSmall" height="110"
+			     is_unicode="false" left="79" max_length="511" mouse_opaque="true"
+			     name="about" width="321" word_wrap="true" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-403" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
+			     mouse_opaque="true" name="Give item:" v_pad="0" width="75">
+				Give item:
+			</text>
+			<view_border blevel_style="in" border_thickness="0" bottom="-466" follows="left|top"
+			     height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"
+			     width="409" />
+			<view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="75"
+			     mouse_opaque="false" name="drop_target_rect_vis" width="321" />
+			<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="center" height="16" left_delta="0"
+			     mouse_opaque="true" name="Give inventory"
+			     tool_tip="Drop inventory items here to give them to this person." v_pad="2"
+			     width="321">
+				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" />
+			<button bottom="-423" follows="left|top" font="SansSerif" halign="center" height="16"
+			     label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"
+			     width="20" />
+			<button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"
+			     label_selected="Find on Map" left="24" mouse_opaque="true"
+			     name="Find on Map" width="100" />
+			<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_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..."
+			     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" />
+		</panel>
+		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+		     label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
+		  <line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
+			     font="SansSerifSmall" height="16" is_unicode="false" left="10"
+			     max_length="254" mouse_opaque="true" name="url_edit"
+			     width="400" />
+			<flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
+			     height="18" label="Load" label_selected="Load" left="10"
+			     mouse_opaque="true" name="load" enabled="false" 
+			     tool_tip="Load this profile page with embedded web browser." width="80" >
+				<flyout_button_item value="open" name="open_item">In external browser</flyout_button_item>
+				<flyout_button_item value="home" name="home_item">Home URL</flyout_button_item>
+			</flyout_button>
+			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+			     height="18" label="?" label_selected="?" left_delta="85"
+			     mouse_opaque="true" name="web_profile_help" width="18" />
+			<check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Automatically load web profiles"
+			     left_delta="30" mouse_opaque="true" name="auto_load"
+			     tool_tip="Automatically load ALL profile webpages without asking first."
+			     width="127" />
+			<web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
+			     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" />
+		</panel>
+		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+		     label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
+			<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="right" height="16" left="4"
+			     mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
+				I Want To:
+			</text>
+			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Build" left_delta="70" mouse_opaque="true"
+			     name="chk0" width="90" />
+			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"
+			     name="chk1" width="90" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Meet" left_delta="-170" mouse_opaque="true"
+			     name="chk2" width="57" />
+			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Be Hired" left_delta="170" mouse_opaque="true"
+			     name="chk6" width="92" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Group" left_delta="-170" mouse_opaque="true"
+			     name="chk3" width="90" />
+			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Buy" left_delta="170" mouse_opaque="true"
+			     name="chk4" width="90" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Sell" left_delta="-170" mouse_opaque="true"
+			     name="chk5" width="50" />
+			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
+			     name="chk7" width="92" />
+			<line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
+			     font="SansSerifSmall" height="16" is_unicode="false" left="74"
+			     max_length="254" mouse_opaque="true" name="want_to_edit"
+			     width="330" />
+			<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="right" height="16" left="4"
+			     mouse_opaque="true" name="Skills:" v_pad="0" width="70">
+				Skills:
+			</text>
+			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Textures" left_delta="70" mouse_opaque="true"
+			     name="schk0" width="90" />
+			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Architecture" left_delta="170"
+			     mouse_opaque="true" name="schk1" width="93" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     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" />
+			<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" />
+			<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Custom Characters" left_delta="170"
+			     mouse_opaque="true" name="schk5" width="127" />
+			<line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
+			     font="SansSerifSmall" height="16" is_unicode="false" left="74"
+			     max_length="254" mouse_opaque="true" name="skills_edit"
+			     width="330" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+			     mouse_opaque="true" name="Languages:" v_pad="0" width="70">
+				Languages:
+			</text>
+			<line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
+			     font="SansSerifSmall" height="16" is_unicode="false" left="74"
+			     max_length="254" mouse_opaque="true" name="languages_edit"
+			     width="330" />
+		</panel>
+		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+		     label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">
+			<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="16" left="114"
+			     mouse_opaque="true"
+			     name="Tell everyone about your favorite places in Second Life." v_pad="0"
+			     width="302">
+				Tell everyone about your favorite places in Second Life.
+			</text>
+			<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+			     height="20" label="New..." label_selected="New..." left="114"
+			     mouse_opaque="true" name="New..." width="75" />
+			<button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
+			     label="Delete..." label_selected="Delete..." left_delta="79"
+			     mouse_opaque="true" name="Delete..." width="75" />
+			<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...
+			</text>
+		</panel>
+		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+		     label="Classified" left="1" mouse_opaque="true" name="Classified"
+		     width="418">
+			<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="16" left="114"
+			     mouse_opaque="true"
+			     name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
+			     width="302">
+				Place an ad in Second Life&apos;s classified listings.
+			</text>
+			<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+			     height="20" label="New..." label_selected="New..." left="114"
+			     mouse_opaque="true" name="New..." width="75" />
+			<button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
+			     label="Delete..." label_selected="Delete..." left_delta="79"
+			     mouse_opaque="true" name="Delete..." width="75" />
+			<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...
+			</text>
+		</panel>
+		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+		     label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
+			<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="right" height="16" left="4"
+			     mouse_opaque="true" name="Photo:" v_pad="0" width="61">
+				Photo:
+			</text>
+			<texture_picker allow_no_texture="true" bottom="-171" can_apply_immediately="false"
+			     default_image_name="None" follows="left|top" height="151" label=""
+			     left="70" mouse_opaque="true" name="img"
+			     tool_tip="Click to choose a picture" width="135" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-203" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+			     mouse_opaque="true" name="Info:" v_pad="0" width="61">
+				Info:
+			</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="right" height="16" left="0"
+			     mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">
+				(250 chars)
+			</text>
+			<text_editor bottom="-347" embedded_items="false"
+			     enabled="true" follows="left|top" font="SansSerifSmall" height="160"
+			     is_unicode="false" left="70" max_length="254" mouse_opaque="false"
+			     name="about" width="330" word_wrap="true" />
+		</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"
+			     mouse_opaque="true" name="label" v_pad="0" width="412">
+				Use this space to record your notes about this person.  Keep track
+of trades in progress, joint projects, etc.  Only you can see these
+notes.  This person cannot see them, nor can other people.
+			</text>
+			<text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
+			     font="SansSerif" height="256" is_unicode="false" left="10"
+			     max_length="1023" mouse_opaque="true" name="notes edit" width="400"
+			     word_wrap="false" />
+		</panel>
+	</tab_container>
+	<button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"
+	     label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />
+	<button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
+	     label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
+	     width="100" />
+	<button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick"
+	     label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
+	<button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze"
+	     label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze"
+	     tool_tip="Stop this resident&apos;s movement and chat." width="72" />
+	<button bottom_delta="-24" font="SansSerif" halign="center" height="20"
+	     label="Unfreeze" label_selected="Unfreeze" left="4" mouse_opaque="true"
+	     name="Unfreeze" tool_tip="Thaw resident" width="72" />
+	<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" />
+	<string name="ShowOnMapNonFriend">
+		Show location on the map.
+Disabled because you have not
+formed a friendship with them.
+	</string>
+	<string name="ShowOnMapFriendOffline">
+		Show location on the map.
+    Disabled because they are not online.
+	</string>
+	<string name="ShowOnMapFriendOnline">
+		Show location on the map.
+	</string>
+	<string name="TeleportGod">
+		Force a teleport to your location.
+	</string>
+	<string name="TeleportPrelude">
+		Offer a teleport to your location.
+Disabled until you leave Orientation Island.
+	</string>
+	<string name="TeleportNormal">
+		Offer a teleport to your location.
+	</string>
+	<string name="Loading">
+		Loading...
+	</string>
+</panel>
-- 
cgit v1.1


From d20e5190a67da2e70a68e6bac630c62e52c6aa0e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 5 Dec 2008 04:25:39 -0700
Subject: Windows now defaults to settings_imprudence.xml when run straight
 from the exe.

---
 linden/indra/newview/llappviewer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 243a9d8..bf45546 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1600,7 +1600,7 @@ bool LLAppViewer::initConfiguration()
 
 	// - set procedural settings 
 	gSavedSettings.setString("ClientSettingsFile", 
-        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global")));
+        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml"));
 
 	gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
 
-- 
cgit v1.1