Merge remote-tracking branch 'Liru/master'

indra/newview/skins/default/xui/en-us/floater_about.xml

@@ -2,7 +2,7 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
  can_resize="false" height="440" min_height="100" min_width="100"
  name="floater_about" rect_control="FloaterAboutRect"
- title="About Singularity Viewer" width="470">
+ title="About [SHORT_APP_NAME]" width="470">
   <tab_container follows="all" bottom="1" border="false" left="10" height="414" width="450" name="about_tab" tab_position="top">
     <panel border="false" height="386" label="Info" help_topic="about_support_tab" name="support_panel">
       <text_editor parse_urls="true" follows="top|left" font="SansSerif" top="-1" bg_readonly_color="transparent" left="3" max_length="65536" name="support_editor" bottom="28" width="443" word_wrap="true"/>
@@ -31,7 +31,7 @@ Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
 cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
 DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
 expat Copyright (C) 1998-2000 Thai Open Source Software Center Ltd., 2001-2006 Expat maintainers.
-FMOD Sound System, Copyright (C) 1994-2012 Firelight Technologies Pty, Ltd.
+FMOD Sound System, Copyright (C) 1994-2013 Firelight Technologies Pty, Ltd.
 FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
 GL Copyright (C) 1999-2004 Brian Paul.
 GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.

indra/newview/skins/default/xui/en-us/floater_about_land.xml

@@ -1382,7 +1382,7 @@ Select the thumbnail to choose a different texture.
 			<name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
 			     column_padding="0" draw_border="true" draw_heading="false" enabled="true"
 			     follows="top|bottom" heading_font="SansSerifSmall" heading_height="14"
-			     height="80" left="20" mouse_opaque="true" multi_select="true"
+			     height="80" left="20" mouse_opaque="true" multi_select="true" name_system="LandManagementNameSystem"
 			     name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" width="195" menu_num="0"/>
 			<button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
 			     halign="center" height="16" label="Add..." label_selected="Add..."
@@ -1402,7 +1402,7 @@ Select the thumbnail to choose a different texture.
 			     column_padding="0" draw_border="true" draw_heading="false" enabled="true"
 			     follows="top|bottom" heading_font="SansSerifSmall"
 			     heading_height="14" height="80" left_delta="0" mouse_opaque="true"
-			     multi_select="true" name="BannedList"
+			     multi_select="true" name="BannedList" name_system="LandManagementNameSystem"
 			     tool_tip="([LISTED] listed, [MAX] max)" width="195" menu_num="0"/>
 			<button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
 			     halign="center" height="16" label="Add..." label_selected="Add..."

indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml

@@ -11,7 +11,10 @@
 	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
 		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="195" left="0" min_width="115" name="im_contents_panel" width="495">
 			<button bottom="-20" follows="left|top" height="20" label="History" left="5" name="history_btn" width="80"/>
-			<button bottom_delta="0" enabled="false" follows="left|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="80" name="start_call_btn" width="80"/>
+            <button bottom_delta="0" follows="left|top" height="20" left_delta="80" width="50" toggle="true" name="ding_btn" label="Ding">
+              <button.commit_callback function="FlipDing"/>
+            </button>
+            <button bottom_delta="0" enabled="false" follows="left|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="50" name="start_call_btn" width="80"/>
 			<button bottom_delta="0" follows="left|top" 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="462" name="toggle_active_speakers_btn" right="495" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
 			<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="143" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>

indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc_concisebuttons.xml

@@ -9,7 +9,10 @@
 	<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="-20" follows="right|top" height="20" label="History" right="-165" name="history_btn" width="80"/>
-	<button bottom_delta="0" enabled="false" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="80" name="start_call_btn" width="80"/>
+    <button bottom_delta="0" follows="left|top" height="20" left_delta="80" width="50" toggle="true" name="ding_btn" label="Ding">
+      <button.commit_callback function="FlipDing"/>
+    </button>
+    <button bottom_delta="0" enabled="false" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="50" name="start_call_btn" width="80"/>
 	<button bottom_delta="0" follows="right|top" 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="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
 	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">

indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml

@@ -14,7 +14,10 @@
 		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="195" left="0" min_width="210" name="im_contents_panel" width="495">
 			<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" follows="left|top" height="20" label="History" left_delta="80" name="history_btn" 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="80" name="start_call_btn" width="80"/>
+            <button bottom_delta="0" follows="left|top" height="20" left_delta="80" width="50" toggle="true" name="ding_btn" label="Ding">
+              <button.commit_callback function="FlipDing"/>
+            </button>
+            <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="50" 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" pad_right="12" visible="false" width="80"/>
 			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="462" name="toggle_active_speakers_btn" right="495" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
 			<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="143" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>

indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml

@@ -12,7 +12,10 @@
 	<string name="muted_text_label">Your text chat has been disabled by a Group Moderator.</string>
 	<button bottom="-20" follows="right|top" height="20" label="Group Info" right="-245" name="group_info_btn" tab_group="0" width="80"/>
 	<button bottom_delta="0" follows="right|top" height="20" label="History" left_delta="80" name="history_btn" width="80"/>
-	<button bottom_delta="0" enabled="false" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="80" name="start_call_btn" width="80"/>
+    <button bottom_delta="0" follows="left|top" height="20" left_delta="80" width="50" toggle="true" name="ding_btn" label="Ding">
+      <button.commit_callback function="FlipDing"/>
+    </button>
+    <button bottom_delta="0" enabled="false" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="50" name="start_call_btn" width="80"/>
 	<button bottom_delta="0" follows="right|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="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
 	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">

indra/newview/skins/default/xui/en-us/floater_tools.xml

@@ -52,7 +52,7 @@
 	     function="BuildTool.setTool"
 	     parameter="Land" />
 	</button>
-	<button name="mini_button" bottom="-34" left="245" height="22" width="22" control_name="LiruMiniBuildFloater" label="" image_selected="down_arrow.tga" image_unselected="up_arrow.tga" scale_image="true" toggle="true" tool_tip="Toggle tiny build floater"/>
+	<button name="mini_button" bottom="-40" left="245" height="22" width="22" control_name="LiruMiniBuildFloater" label="" image_selected="down_arrow.tga" image_unselected="up_arrow.tga" scale_image="true" toggle="true" tool_tip="Toggle tiny build floater"/>
 
 <!-- Focus panel -->
 

indra/newview/skins/default/xui/en-us/menu_login.xml

@@ -21,10 +21,10 @@
 	<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="false" width="166">
-		<menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
+		<!--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-->
 		<menu_item_call bottom="-48" enabled="true" height="19" label="About [APP_NAME]..." left="0"
 		     mouse_opaque="true" name="About Second Life..." width="166">
 			<on_click function="ShowFloater" userdata="about" />

indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml

@@ -55,7 +55,7 @@
           </menu_item_call>
         </pie_menu>
 		<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
-			<on_click function="Object.Inspect" />
+			<on_click function="ShowFloater" userdata="inspect" />
 			<on_enable function="Object.EnableInspect"/>
 		</menu_item_call>
 		<menu_item_call enabled="false" label="Data" mouse_opaque="true" name="Data">

indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml

@@ -56,7 +56,7 @@
 		</menu_item_call>
 		<menu_item_separator />
 		<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
-			<on_click function="Object.Inspect" />
+			<on_click function="ShowFloater" userdata="inspect" />
 			<on_enable function="Object.EnableInspect" />
 		</menu_item_call>
 	</pie_menu>

indra/newview/skins/default/xui/en-us/menu_pie_object.xml

@@ -81,7 +81,7 @@
 				<on_enable function="Object.EnableMute" />
 			</menu_item_call>
 			<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
-				<on_click function="Object.Inspect" />
+				<on_click function="ShowFloater" userdata="inspect" />
 				<on_enable function="Object.EnableInspect" />
 			</menu_item_call>
 			<menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">

indra/newview/skins/default/xui/en-us/menu_pie_self.xml

@@ -4,7 +4,7 @@
 		<on_click function="ShowAgentProfile" userdata="agent" />
 	</menu_item_call>
 	<menu_item_call enabled="true" label="Groups..." name="Groups...">
-		<on_click function="ShowAgentGroups" userdata="agent" />
+		<on_click function="ShowFloater" userdata="groups" />
 	</menu_item_call>
 	<pie_menu enabled="true" label="Take Off" name="Take Off">
 		<pie_menu enabled="true" label="Clothes" name="Clothes">
@@ -91,7 +91,7 @@
       </menu_item_call>
 	  <menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true"
 						   name="Anims...">
-		  <on_click function="Avatar.Anims" />
+		<on_click function="ShowFloater" userdata="anims_explorer" />
 	  </menu_item_call>
 	  <menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
 		  <on_click function="Object.ScriptCount" />

indra/newview/skins/default/xui/en-us/menu_viewer.xml

@@ -38,7 +38,7 @@
 		<on_enable function="Object.EnableImport" />
 	</menu_item_call>
 	<menu_item_call label="Change Local Textures" mouse_opaque="true" name="Change Local Textures">
-		<on_click function="File.LocalAssetBrowser"/>
+		<on_click function="ShowFloater" userdata="local assets"/>
 	</menu_item_call>
     <menu_item_separator enabled="true" label="-----------" mouse_opaque="true" name="separator" />
     <menu_item_call enabled="true" label="Set Default Permissions..." 
@@ -77,7 +77,7 @@
 		<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="" />
+			<on_click function="ShowFloater" userdata="snapshot"/>
 		</menu_item_call>
 		<menu_item_call bottom="-186" enabled="true" height="19" label="Snapshot to Disk" left="0"
 		     mouse_opaque="true" name="Snapshot to Disk" shortcut="control|`"
@@ -134,7 +134,7 @@
 		     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="" />
+			<on_click function="ShowFloater" userdata="search"/>
 		</menu_item_call>
 		<menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator3" width="153" />
@@ -269,7 +269,7 @@
 		</menu_item_check>
 		<menu_item_call bottom="-408" enabled="true" height="19" label="Groups..." left="0"
 		     mouse_opaque="true" name="Groups..." shortcut="control|shift|G" width="153">
-			<on_click function="ShowAgentGroups" userdata="agent" />
+			<on_click function="ShowFloater" userdata="groups" />
 		</menu_item_call>
 		<menu_item_separator bottom="-416" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator8" width="153" />
@@ -285,12 +285,12 @@
 		     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_click function="ShowFloater" userdata="mouselook"/>
 			<on_enable function="View.EnableMouselook" />
 		</menu_item_call>
 		<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_click function="ShowFloater" userdata="build" />
 			<on_check function="View.CheckBuildMode" />
 		</menu_item_check>
 		<menu_item_check bottom="-48" enabled="true" height="19" label="Joystick Flycam" left="0"
@@ -331,8 +331,8 @@
         </menu_item_check>
 		<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="View.Communicate"/>
-            <on_check function="FloaterVisible" userdata="communicate" />
+             <on_click function="ShowFloater" userdata="im"/>
+             <on_check function="FloaterVisible" userdata="im"/>
         </menu_item_check>
 		<menu_item_check bottom="-170" enabled="true" height="19" label="Inventory" left="0"
 		     mouse_opaque="true" name="Inventory" shortcut="control|I" width="211">
@@ -383,7 +383,7 @@
 		</menu_item_check>
 		<menu_item_check bottom="-273" enabled="true" height="19" label="Radar" left="0"
 		     mouse_opaque="true" name="Radar" shortcut="control|shift|A" width="211">
-			<on_click function="View.ToggleAvatarList" userdata="radar" />
+			<on_click function="ShowFloater" userdata="radar" />
 			<on_check control="ShowRadar" />
 		</menu_item_check>
 		<menu_item_separator bottom="-281" enabled="true" height="8" label="-----------" left="0"
@@ -495,12 +495,12 @@
 	     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="" />
+			<on_click function="FloaterShow" userdata="chatbar" />
 		</menu_item_call>
 		<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="" />
+			<on_click function="ShowFloater" userdata="always run" />
+			<on_check function="FloaterVisible" userdata="always run" />
 		</menu_item_check>
 		<menu_item_call bottom="-67" enabled="true" height="19" label="Sit on Ground" left="0"
 		     mouse_opaque="true" name="Sit on Ground" shortcut="control|alt|S" width="185">
@@ -509,7 +509,7 @@
 		</menu_item_call>
 		<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_click function="ShowFloater" userdata="fly"/>
 			<on_enable function="World.EnableFly" />
 			<on_check control="FlyBtnState" />
 		</menu_item_check>
@@ -635,15 +635,15 @@
 			     mouse_opaque="true" name="separator" width="169" />
       <menu_item_call bottom="-132" enabled="false" height="19" label="Environment Editor" left="0"
 			     mouse_opaque="true" name="Environment Editor" width="169">
-        <on_click function="World.EnvSettings" userdata="editor" />
+        <on_click function="ShowFloater" userdata="EnvSettings" />
       </menu_item_call>
       <menu_item_call bottom="-151" enabled="false" height="19" label="Day Cycle Editor" left="0"
 			     mouse_opaque="true" name="Day Cycle Editor" width="169">
-        <on_click function="World.DayCycle" userdata="editor" />
+        <on_click function="ShowFloater" userdata="DayCycle" />
       </menu_item_call>
 	  <menu_item_call bottom="-173" enabled="false" height="19" label="Post-Processing Effects" left="0"
 		     mouse_opaque="true" name="Post-Processing Effects" width="169">
-			 <on_click function="World.PostProcess" userdata="editor" />
+			 <on_click function="ShowFloater" userdata="PostProcess" />
      </menu_item_call>
 		</menu>
 	</menu>
@@ -895,7 +895,7 @@
 	<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"
+		<!--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-->
@@ -917,8 +917,7 @@
 			<on_click function="PromptShowURL" name="ScriptingPortal_url"
 			     userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
 		</menu_item_call>
-		<menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator3" width="166" />
+		<menu_item_separator name="separator3"/>
 		<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" />
@@ -931,8 +930,7 @@
 		<menu_item_call label="Lag Meter" name="Lag Meter">
 			<on_click function="ShowFloater" userdata="lag meter" />
 		</menu_item_call>
-		<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator7" width="250" />
+		<menu_item_separator name="separator7"/>
 		<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">
@@ -946,13 +944,12 @@
 				<on_click function="PromptShowURL" name="PublicIssueTrackerHelp_url"
 				     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
 			</menu_item_call>
-			<menu_item_call bottom="-94" enabled="true" height="19" label="Singularity Issue Tracker..."
+			<menu_item_call bottom="-94" enabled="true" height="19" label="[SHORT_APP_NAME] Issue Tracker..."
 			     left="0" mouse_opaque="true" name="Singularity Issue Tracker..." width="166">
 				<on_click function="PromptShowURL" name="SinguIssueTracker_url"
 						userdata="WebLaunchSinguIssue,http://links.singularityviewer.org/?to=issues" />
 			</menu_item_call>
-			<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator7" width="250" />
+			<menu_item_separator name="separator7" />
 			<menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
 			     mouse_opaque="true" name="Bug Reporting 101..." width="166">
 				<on_click function="PromptShowURL" name="BugReporting101_url"
@@ -968,15 +965,14 @@
 				<on_click function="PromptShowURL" name="QAWiki_url"
 				     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
 			</menu_item_call>
-			<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator9" width="250" />
+			<menu_item_separator name="separator9"/>
 			<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" name="ReportBug_url"
 				     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
 			</menu_item_call>
-			<menu_item_call bottom="-240" enabled="true" height="19" label="Report Singularity Bug..." left="0"
-			     mouse_opaque="true" name="Report Singularity Bug..." width="166">
+			<menu_item_call bottom="-240" enabled="true" height="19" label="Report [SHORT_APP_NAME] Bug..." left="0"
+			     mouse_opaque="true" name="Report [SHORT_APP_NAME] Bug..." width="166">
 				<on_click function="PromptShowURL" name="ReportSinguBug_url"
 						userdata="WebLaunchSinguIssue,http://code.google.com/p/singularity-viewer/issues/entry" />
 			</menu_item_call>
@@ -989,7 +985,7 @@
 			<on_click function="ShowFloater" userdata="about" />
 		</menu_item_call>
 	</menu>
-	<menu create_jump_keys="true" drop_shadow="true" enabled="true" label="Singularity" mouse_opaque="false" name="Singularity" opaque="true" tear_off="true">
+	<menu create_jump_keys="true" drop_shadow="true" enabled="true" label="[SHORT_APP_NAME]" mouse_opaque="false" name="Singularity" opaque="true" tear_off="true">
 		<menu_item_call label="Close All Dialogs" mouse_opaque="true" name="Close All Dialogs" shortcut="control|alt|shift|D">
 			<on_click function="CloseAllDialogs"/>
 		</menu_item_call>
@@ -1002,7 +998,7 @@
 		</menu_item_call>
 		<menu_item_separator mouse_opaque="true" name="separators2"/>
 		<menu_item_call label="Animation Override..." mouse_opaque="true" name="Animation Override ...">
-			<on_click function="AnimationOverride"/>
+			<on_click function="ShowFloater" userdata="ao"/>
 		</menu_item_call>
 		<menu_item_check label="Nimble" mouse_opaque="true" name="Nimble">
 			<on_click function="Nimble"/>
@@ -1022,8 +1018,8 @@
 			<on_check function="FloaterVisible" userdata="asset_blacklist"/>
 		</menu_item_check>
 		<menu_item_check label="Streaming Audio Display" mouse_opaque="true" name="Streaming Audio Display">
-			<on_click function="StreamingAudioDisplay"/>
-			<on_check function="CheckStreamingAudioDisplay"/>
+			<on_click function="ShowFloater" userdata="media ticker"/>
+			<on_check function="FloaterVisible" userdata="media ticker"/>
 			<on_enable function="EnableStreamingAudioDisplay"/>
 		</menu_item_check>
 		<menu_item_check label="Pose Stand" mouse_opaque="true" name="Pose Stand">
@@ -1031,8 +1027,8 @@
 			<on_check function="CheckPoseStand"/>
 		</menu_item_check>
 		<menu_item_check label="Region Debug Console" mouse_opaque="true" name="Region Debug Console">
-			<on_click function="RegionDebugConsole"/>
-			<on_check function="CheckRegionDebugConsole"/>
+			<on_click function="ShowFloater" userdata="RegionDebugConsole"/>
+			<on_check function="FloaterVisible" userdata="RegionDebugConsole"/>
 			<on_visible function="VisibleRegionDebugConsole"/>
 		</menu_item_check>
 		<menu_item_separator mouse_opaque="true" name="separators3" />

indra/newview/skins/default/xui/en-us/panel_group_general.xml

@@ -76,7 +76,7 @@ Hover your mouse over the options for more help.
 	<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-88"
 	     column_padding="0" draw_border="true" draw_heading="true" multi_select="true"
 	     follows="left|top" heading_font="SansSerifSmall" heading_height="14"
-	     height="80" left="7" mouse_opaque="true" menu_num="0"
+	     height="80" left="7" mouse_opaque="true" menu_num="0" name_system="GroupMembersNameSystem"
 	     name="visible_members" width="404">
 		<column label="Member Name" name="name" relwidth="0.45" />
 		<column label="Title" name="title" relwidth="0.30" />

indra/newview/skins/default/xui/en-us/panel_group_roles.xml

@@ -72,7 +72,7 @@ execute the Ability.
 			     label="Search" left_delta="105" name="search_button" width="60" />
 			<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-121"
 			     column_padding="0" draw_border="true" draw_heading="true"
-			     heading_font="SansSerifSmall" menu_num="0"
+			     heading_font="SansSerifSmall" menu_num="0" name_system="GroupMembersNameSystem"
 			     heading_height="14" height="120" left="4" multi_select="true"
 			     name="member_list" width="396">
 				<column label="Member Name" name="name" width="136" />
@@ -222,7 +222,7 @@ things in this group. There&apos;s a broad variety of Abilities.
 		</text>
 		<name_list bottom_delta="-105" draw_border="true" draw_stripes="false" enabled="false"
 		     height="105" left="0" multi_select="true" name="role_assigned_members"
-		     width="145" menu_num="0"/>
+		     width="145" menu_num="0" name_system="GroupMembersNameSystem"/>
 		<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"
@@ -263,6 +263,6 @@ things in this group. There&apos;s a broad variety of Abilities.
 		<name_list background_opaque="true" background_visible="true" bg_alpha_color="blue"
 		     bg_opaque_color="grey" bottom_delta="0" draw_border="true"
 		     height="125" left="150" multi_select="true" name="action_members"
-		     width="254" menu_num="0"/>
+		     width="254" menu_num="0" name_system="GroupMembersNameSystem"/>
 	</panel>
 </panel>

indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml

@@ -54,9 +54,44 @@
       <check_box bottom_delta="-20" follows="top" control_name="OtherChatsTornOff" label="Open new IMs in separate floaters" name="chats_torn_off"/>
       <check_box bottom_delta="-20" follows="top" control_name="PhoenixIMAnnounceStealFocus" label="Focus new instant messages" name="chat_steal_focus"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="ShowLocalChatFloaterBar" label="Show chat bar in torn-off local chat floater" name="show_local_chat_floater_bar"/>
-      <check_box bottom_delta="-20" control_name="ContactsUseHorizontalButtons" follows="top" height="16" label="Use horizontal buttons for contacts floater (Needs restart)" tool_tip="When enabled, the buttons on the Friends and Groups panels will be at the bottom, horizontally arranged, instead of vertically arranged on the right." name="horiz_butt"/>	  
-      <check_box bottom_delta="-20" follows="top" height="16" control_name="LiruLegacySpeakerNames" label="Use legacy names for speaker lists (Affects new speakers)" tool_tip="Allows for easier moderation of chats by showing only the account names" name="legacy_speaker_names"/>
-      <check_box bottom_delta="-20" control_name="UseConciseIMButtons" follows="top" height="16" label="Buttons on the same line as name for IMs (Affects new IMs)" name="im_concise_butt"/>
+      <check_box bottom_delta="-20" control_name="ContactsUseHorizontalButtons" follows="top" height="16" label="Use horizontal buttons for contacts floater (Needs restart)" tool_tip="When enabled, the buttons on the Friends and Groups panels will be at the bottom, horizontally arranged, instead of vertically arranged on the right." name="horiz_butt"/>
+      <text bottom_delta="-14" left="16" follows="top" name="namesystems_text_box">Format for names in lists of/for:</text>
+      <text bottom_delta="-18" left="20" follows="top" name="friends_namesystem_text_box">Friends:</text>
+      <combo_box bottom_delta="-5" left_delta="140" follows="top" height="18" control_name="FriendNameSystem" name="friends_namesystem_combobox" width="130">
+        <combo_item name="Old Names" value="0">Old Names</combo_item>
+        <combo_item name="Display Names (with Username)" value="1">Display Names (w/Username)</combo_item>
+        <combo_item name="Display Names only" value="2">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)" value="3">Old Names (w/Display)</combo_item>
+      </combo_box>
+      <text bottom_delta="-18" left="20" follows="top" name="group_members_namesystem_text_box">Group Members:</text>
+      <combo_box bottom_delta="-5" left_delta="140" follows="top" height="18" control_name="GroupMembersNameSystem" name="group_members_namesystem_combobox" width="130">
+        <combo_item name="Old Names" value="0">Old Names</combo_item>
+        <combo_item name="Display Names (with Username)" value="1">Display Names (w/Username)</combo_item>
+        <combo_item name="Display Names only" value="2">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)" value="3">Old Names (w/Display)</combo_item>
+      </combo_box>
+      <text bottom_delta="-18" left="20" follows="top" name="land_management_namesystem_text_box">Land Management:</text>
+      <combo_box bottom_delta="-5" left_delta="140" follows="top" height="18" control_name="LandManagementNameSystem" name="land_management_namesystem_combobox" width="130">
+        <combo_item name="Old Names" value="0">Old Names</combo_item>
+        <combo_item name="Display Names (with Username)" value="1">Display Names (w/Username)</combo_item>
+        <combo_item name="Display Names only" value="2">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)" value="3">Old Names (w/Display)</combo_item>
+      </combo_box>
+      <text bottom_delta="-18" left="20" follows="top" name="radar_namesystem_text_box">Radar:</text>
+      <combo_box bottom_delta="-5" left_delta="140" follows="top" height="18" control_name="RadarNameSystem" name="radar_namesystem_combobox" width="130">
+        <combo_item name="Old Names" value="0">Old Names</combo_item>
+        <combo_item name="Display Names (with Username)" value="1">Display Names (w/Username)</combo_item>
+        <combo_item name="Display Names only" value="2">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)" value="3">Old Names (w/Display)</combo_item>
+      </combo_box>
+      <text bottom_delta="-18" left="20" follows="top" name="speaker_namesystem_text_box">Speakers:</text>
+      <combo_box bottom_delta="-5" left_delta="140" follows="top" height="18" control_name="SpeakerNameSystem" name="speaker_namesystem_combobox" width="130">
+        <combo_item name="Old Names" value="0">Old Names</combo_item>
+        <combo_item name="Display Names (with Username)" value="1">Display Names (w/Username)</combo_item>
+        <combo_item name="Display Names only" value="2">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)" value="3">Old Names (w/Display)</combo_item>
+      </combo_box>
+      <check_box bottom_delta="-24" left="10" control_name="UseConciseIMButtons" follows="top" height="16" label="Buttons on the same line as name for IMs (Affects new IMs)" name="im_concise_butt"/>
       <check_box bottom_delta="-20" control_name="UseConciseGroupChatButtons" follows="top" height="16" label="Buttons on group chat name line (Affects new group chats)" name="group_concise_butt"/>
       <check_box bottom_delta="-20" control_name="UseConciseConferenceButtons" follows="top" height="16" label="Buttons on conference title line (Affects new conferences)" name="conf_concise_butt"/>
       <check_box bottom_delta="-20" follows="top" height="16" control_name="LiruLegacyLogLaunch" label="Log button opens external text editor (Windows only)" name="legacy_log_launch"/>

indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml

@@ -83,9 +83,9 @@
     </panel>
 
     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Security" name="Security">
-      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" follows="top" initial_value="true" label="Broadcast Viewer Effects (Does not include beams)" left="10" name="broadcast_viewer_effects" width="400"/>
+      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" follows="top" initial_value="true" label="Broadcast Viewer Effects (does not affect pointat and lookat)" left="10" name="broadcast_viewer_effects" width="400"/>
       <check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" follows="top" initial_value="true" label="Disable Point At And Beam" tool_tip="Don't point at or show your edit beam when selecting an object." name="disable_point_at_and_beams_check"/>
-      <check_box bottom_delta="-20" control_name="PrivateLookAt" follows="top" initial_value="false" label="Do not Look At objects (defeats ShowLookAt)" tool_tip="Turns off broadcasting headturns and lookat beacons for yourself." name="private_look_at_check"/>
+	  <check_box bottom_delta="-20" control_name="PrivateLookAt" follows="top" initial_value="false" label="Do not Look At objects and/or avatars" tool_tip="Disables headturns and lookat beacons: causes your avatar to look straight ahead like a zombie." name="private_look_at_check"/>
       <check_box bottom_delta="-20" control_name="AscentShowLookAt" follows="top" initial_value="false" label="Show others' LookAt beacons" tool_tip="Shows you where others are looking." name="show_look_at_check"/>
       <check_box bottom_delta="-20" control_name="SGDetachBridge" follows="top" initial_value="false" label="Auto detach LSL Bridge" tool_tip="Automatically detach LSL Bridge of Phoenix or Firestorm viewer." name="detach_bridge"/>
       <check_box bottom_delta="-20" control_name="QuietSnapshotsToDisk" follows="top" initial_value="false" label="Quiet Snapshots to Disk" tool_tip="Doesn't make a camera sound nor alert everyone when you take a snapshot to your computer." name="quiet_snapshots_check"/>

indra/newview/skins/default/xui/en-us/panel_preferences_general.xml

@@ -11,9 +11,10 @@
 		<combo_item name="Always" value="Always">Always</combo_item>
 	</combo_box>
 	<combo_box bottom_delta="0" follows="top" height="18" left="220" name="namesystem_combobox" width="166">
-		<combo_item name="Old Names" value="Old Names">Old Names</combo_item>
-		<combo_item name="Display Names (with Username)" value="Display Names (with Username)">Display Names(w/Username)</combo_item>
-		<combo_item name="Display Names only" value="Display Names only">Display Names only</combo_item>
+		<combo_item name="Old Names" value="0">Old Names</combo_item>
+		<combo_item name="Display Names (with Username)" value="1">Display Names (w/Username)</combo_item>
+		<combo_item name="Display Names only" value="2">Display Names only</combo_item>
+		<combo_item name="Old Names (with Display Names)" value="3">Old Names (w/Display)</combo_item>
 	</combo_box>
 	<check_box bottom_delta="0" follows="top" height="16" label="Show Resident" left_delta="174" name="show_resident_checkbox"/>
 	<check_box bottom_delta="-25" follows="top" height="16" initial_value="true" label="Small Avatar Names" left="101" name="small_avatar_names_checkbox"/>

indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml

@@ -118,6 +118,12 @@
       <combo_item name="4x" value="4">4x</combo_item>
       <combo_item name="8x" value="8">8x</combo_item>
       <combo_item name="16x" value="16">16x</combo_item>
+    </combo_box>
+    <text bottom="-57" height="12" left="10" name="VSync:" width="128">VSync:</text>
+    <combo_box bottom="-61" height="16" initial_value="false" label="VSync" left="148" name="vsync" width="64">
+      <combo_item name="VSyncDisabled" value="0">Disabled</combo_item>
+      <combo_item name="VSyncStandard" value="1">Standard</combo_item>
+      <combo_item name="VSyncAdaptive" value="-1">Adaptive</combo_item>
     </combo_box>
 	<spinner bottom_delta="70" control_name="TextureMemory" decimal_digits="0" height="16" increment="16" initial_val="32" label="Texture Memory (MB):" label_width="138" left="10" max_val="4096" min_val="0" 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="202"/>
 	<check_box bottom_delta="-25" control_name="RenderVBOEnable" height="16" initial_value="true" label="Enable OpenGL Vertex Buffer Objects" left="5" name="vbo"
@@ -126,7 +132,7 @@
 		tool_tip="Disabling this may improve performance when VBOs are enabled. Disabling produced observable improvement on various AMD GPUs."/>
     <check_box bottom_delta="-25" control_name="RenderUseFBO" height="16" initial_value="true" label="Enable OpenGL Frame Buffer Objects" left="5" name="fbo"
 	  tool_tip="Enabling this on modern hardware can provide a performance gain. However, enabling this when combined with antialiasing on AMD GPUs may cause edge artifacts. This setting is required for deferred rendering."/>
-	<spinner bottom="-42" control_name="RenderGamma" decimal_digits="2" height="16" increment="0.01" initial_val="1" label="Gamma:" label_width="138" left="250" max_val="2" min_val="0.0" name="gamma" width="202" tool_tip="(brightness, lower is brighter)"/>
+	<spinner bottom="-41" control_name="RenderGamma" decimal_digits="2" height="16" increment="0.01" initial_val="1" label="Gamma:" label_width="138" left="250" max_val="2" min_val="0.0" name="gamma" width="202" tool_tip="(brightness, lower is brighter)"/>
 	<spinner bottom_delta="70" control_name="RenderFogRatio" decimal_digits="1" height="16" increment="0.1" initial_val="4" label="Fog Distance Ratio:" label_width="138" max_val="10" min_val="0.5" name="fog" width="202"/>
 	<text bottom_delta="-50" height="40" name="note">
 Note: The Gamma and Fog Distance Ratio

indra/newview/skins/default/xui/en-us/panel_region_estate.xml

@@ -258,6 +258,7 @@
      multi_select="true"
      name="estate_manager_name_list"
      menu_num="0"
+     name_system="LandManagementNameSystem"
      bottom_delta="0"
      width="220" />
 
@@ -278,6 +279,7 @@
      multi_select="true"
      name="allowed_avatar_name_list"
      menu_num="0"
+     name_system="LandManagementNameSystem"
      bottom_delta="0"
      width="220" />
 
@@ -400,6 +402,7 @@
      multi_select="true"
      name="banned_avatar_name_list"
      menu_num="0"
+     name_system="LandManagementNameSystem"
      bottom_delta="0"
      width="220" />
 

indra/newview/skins/default/xui/en-us/panel_toolbar.xml

@@ -5,44 +5,456 @@
   <string name="IM">1 IM</string>
   <panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024"/>
   <layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" orientation="horizontal" border_size="0">
-	  <layout_panel name="panel1" height="2" width="2" auto_resize="false" user_resize="false">
-		  <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0" left="0" />
-	  </layout_panel>
-    <layout_panel name="panel2" height="24" width="50" auto_resize="false" user_resize="false">
-		  <button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" follows="left|right" />
-	  </layout_panel>
-	  <layout_panel name="panel3" height="2" width="2" auto_resize="false" user_resize="false">
-		  <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0"/>
-	  </layout_panel>
-	  <layout_panel name="panel4" height="24" width="50" user_resize="false">
-		  <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0" name="communicate_btn" tool_tip="Communicate with your Friends and Groups.(Ctrl-T)" list_position="above" width="50" follows="left|right"/>
-	  </layout_panel>
-	  <layout_panel name="panel5" height="2" width="2" auto_resize="false" user_resize="false">
-		  <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-	  </layout_panel>
-	  <layout_panel name="panel6" height="24" width="50" user_resize="false">
-		  <button bottom="0" height="24" label="Radar" image_overlay="icn_toolbar_radar.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Radar" name="radar_list_btn" tool_tip="View a list of nearby avatars.(Ctrl-Shift-A)" width="50" follows="left|right"/>
-	  </layout_panel>
-	  <layout_panel name="panel7" height="24" width="50" user_resize="false">
-		  <button bottom="0" height="24" label="Fly" image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Stop Flying" name="fly_btn" tool_tip="Start flying(F or Home). Use E/C or PgUp/PgDn to fly up and down." width="50" follows="left|right"/>
-	  </layout_panel>
-	  <layout_panel name="panel8" height="24" width="50" user_resize="false">
-		  <button bottom="0" height="24" label="Snapshot" image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory.(Ctrl-Shift-S for floater, Ctrl-`(~) takes snapshot w/o floater)" width="50" follows="left|right"/>
-	  </layout_panel>
-	  <layout_panel name="panel9" height="24" width="50" user_resize="false">
-		  <button bottom="0" height="24" label="Search" image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="directory_btn" tool_tip="Search for places, events, people, and more.(Ctrl-F)" width="50" follows="left|right"/>
-	  </layout_panel>
-	  <layout_panel name="panel10" height="24" width="50" user_resize="false">
-		  <button bottom="0" height="24" label="Build" name="build_btn" image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Create new objects. (B)" width="50" follows="left|right"/>
-	  </layout_panel>
-	  <layout_panel name="panel11" height="24" width="50" user_resize="false">
-		  <button bottom="0" height="24" label="Map" name="map_btn" image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right"/>
-	  </layout_panel>
-	  <layout_panel name="panel12" height="24" width="50" user_resize="false">
-		  <button bottom="0" height="24" label="Mini-Map" image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)" width="50" follows="left|right"/>
-	  </layout_panel>
-	  <layout_panel name="panel13" height="24" width="50" user_resize="false">
-		  <button bottom="0" height="24" label="Inventory" image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right"/>
-	  </layout_panel>
+    <layout_panel name="panel1" height="2" width="2" auto_resize="false" user_resize="false" visibility_control="ToolbarVisibleChatbar">
+      <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0" left="0" />
+    </layout_panel>
+    <layout_panel name="panel2" height="24" width="50" auto_resize="false" user_resize="false" visibility_control="ToolbarVisibleChatbar">
+      <button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" follows="left|right" control_name="ChatVisible">
+        <button.commit_callback function="ShowFloater" parameter="chatbar"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panel3" height="2" width="2" auto_resize="false" user_resize="false" visibility_control="ToolbarVisibleChatbar">
+      <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0"/>
+    </layout_panel>
+    <layout_panel name="panel4" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleCommunicateIM">
+      <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0" name="communicate_btn" tool_tip="Communicate with your Friends and Groups.(Ctrl-T)" list_position="above" width="50" follows="left|right"/>
+    </layout_panel>
+    <layout_panel name="panel5" height="2" width="2" auto_resize="false" user_resize="false" visibility_control="ToolbarVisibleCommunicateIM">
+      <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
+    </layout_panel>
+    <layout_panel name="panelim" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleCommunicate">
+      <button bottom="0" height="24" label="Communicate" image_overlay="icn_toolbar_im.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="communicate_im_btn" tool_tip="Communicate with your Friends and Groups.(Ctrl-T)" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="im"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelfriends" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleFriends">
+      <button bottom="0" height="24" label="Friends" image_overlay="icn_toolbar_friends.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="friends_btn" tool_tip="Open your Friends List. (Ctrl-Shift-F)" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="friends"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelgroups" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleGroups">
+      <button bottom="0" height="24" label="Groups" image_overlay="icn_toolbar_groups.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="groups_btn" tool_tip="Open your Groups List. (Ctrl-Shift-G)" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="groups"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelgrouptitles" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleGroupTitles">
+      <button bottom="0" height="24" label="Group Titles" image_overlay="icn_toolbar_group_titles.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="group_titles_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="group_titles"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelchathistory" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleChatHistory">
+      <button bottom="0" height="24" label="Local Chat" image_overlay="icn_toolbar_local_chat.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="chat_history_btn" tool_tip="Open Local Chat. (Ctrl-H)" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="chat history"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelactivespeakers" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleActiveSpeakers">
+      <button bottom="0" height="24" label="Active Speakers" name="active_speakers_btn" image_overlay="active_speakers.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="active speakers"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelmutelist" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMuteList">
+      <button bottom="0" height="24" label="Mute List" image_overlay="icn_toolbar_mute_list.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="mute_list_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="mute list"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelassetblacklist" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAssetBlacklist">
+      <button bottom="0" height="24" label="Asset Blacklist" image_overlay="icn_toolbar_asset_blacklist.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="assetblack_list_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="asset_blacklist"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelvoiceeffect" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleVoiceEffect">
+      <button bottom="0" height="24" label="Voice FX" name="voice_effects_btn" image_overlay="icn_toolbar_voice_effects.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="voice effect"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelgestures" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleGestures">
+      <button bottom="0" height="24" label="Gestures" name="gestures_btn" tool_tip="Ctrl-G" image_overlay="icn_toolbar_gestures.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="gestures"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelbeacons" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleBeacons">
+      <button bottom="0" height="24" label="Beacons" name="beacons_btn" image_overlay="icn_toolbar_beacons.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="beacons"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panel6" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleRadar">
+      <button bottom="0" height="24" label="Radar" image_overlay="icn_toolbar_radar.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Radar" name="radar_list_btn" tool_tip="View a list of nearby avatars.(Ctrl-Shift-A)" width="50" follows="left|right" control_name="ShowRadar">
+        <button.commit_callback function="ShowFloater" parameter="radar"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelcameracontrols" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleCameraControls">
+      <button bottom="0" height="24" label="Camera Controls" name="camera_controls_btn" image_overlay="icn_toolbar_camera_controls.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="camera controls"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelmessagelog" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMovementControls">
+      <button bottom="0" height="24" label="Movement Controls" name="movement_controls_btn" image_overlay="icn_toolbar_movement_controls.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="movement controls"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelmouselook" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMouselook">
+      <button bottom="0" height="24" label="Mouselook" image_overlay="icn_toolbar_mouselook.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="mouselook_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="mouselook"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panel7" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleFly">
+      <button bottom="0" height="24" label="Fly" image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Stop Flying" name="fly_btn" tool_tip="Start flying(F or Home). Use E/C or PgUp/PgDn to fly up and down." width="50" follows="left|right" control_name="FlyBtnState">
+        <button.commit_callback function="ShowFloater" parameter="fly"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelsit" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleSit">
+      <button bottom="0" height="24" label="Sit" image_overlay="icn_toolbar_sit.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Stand" name="sit_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="sit"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelrun" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAlwaysRun">
+      <button bottom="0" height="24" label="Run" image_overlay="icn_toolbar_run.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Stop Running" name="run_btn" tool_tip="Turn on Run mode (Ctrl-R)" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="always run"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelvelocity" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleVelocity">
+      <button bottom="0" height="24" label="Velocity" image_overlay="icn_toolbar_run.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="run_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="velocity"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelmeanevents" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMeanEvents">
+      <button bottom="0" height="24" label="Bumps" name="bumps_btn" image_overlay="icn_toolbar_bumps.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="mean events"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelmediaticker" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMediaTicker">
+      <button bottom="0" height="24" label="Stream Display" name="media_ticker_btn" image_overlay="icn_toolbar_media_ticker.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="media ticker"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelmediafilter" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMediaFilter">
+      <button bottom="0" height="24" label="Media Filter" name="media_filter_btn" image_overlay="icn_toolbar_media_filter.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="media filter"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panel8" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleSnapshot">
+      <button bottom="0" height="24" label="Snapshot" image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory.(Ctrl-Shift-S for floater, Ctrl-`(~) takes snapshot w/o floater)" width="50" follows="left|right" control_name="SnapshotBtnState">
+        <button.commit_callback function="ShowFloater" parameter="snapshot"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelappearance" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAppearance">
+      <button bottom="0" height="24" label="Appearance" name="appearance_btn" image_overlay="icn_toolbar_appearance.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="appearance"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panel9" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleSearch">
+      <button bottom="0" height="24" label="Search" image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="directory_btn" tool_tip="Search for places, events, people, and more.(Ctrl-F)" width="50" follows="left|right" control_name="ShowDirectory">
+        <button.commit_callback function="ShowFloater" parameter="search"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelweb" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleWeb">
+      <button bottom="0" height="24" label="Web Browser" name="web_browser_btn" image_overlay="icn_toolbar_web.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="web"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelao" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAO">
+      <button bottom="0" height="24" label="AO Settings" name="ao_btn" image_overlay="icn_toolbar_ao.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="ao"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneldebugsettings" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleDebugSettings">
+      <button bottom="0" height="24" label="Debug Settings" name="debug_settings_btn" image_overlay="icn_toolbar_debug_settings.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="debug settings"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneldebugavatar" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleDebugAvatar">
+      <button bottom="0" height="24" label="Debug Avatar" name="debug_avatar_btn" image_overlay="icn_toolbar_debug_avatar.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="debug avatar"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelanimsexplorer" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAnimsExplorer">
+      <button bottom="0" height="24" label="Anims Explorer" name="anims_explorer_btn" image_overlay="icn_toolbar_anims_explorer.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="anims_explorer"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelsoundexplorer" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleSoundExplorer">
+      <button bottom="0" height="24" label="Sound Explorer" name="sound_explorer_btn" image_overlay="icn_toolbar_sound_explorer.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="sound_explorer"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelareasearch" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAreaSearch">
+      <button bottom="0" height="24" label="Area Search" name="areasearch_btn" image_overlay="icn_toolbar_areasearch.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="areasearch"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelinspect" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleInspect">
+      <button bottom="0" height="24" label="Inspect" name="inspect_btn" image_overlay="icn_toolbar_inspect.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="inspect"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelpathingchars" height="24" width="50" user_resize="false" visibility_control="ToolbarVisiblePathfindingCharacters">
+      <button bottom="0" height="24" label="Characters" name="pathing_characters_btn" image_overlay="icn_toolbar_pathfinding_characters.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="pathfinding_characters"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelpathinglinksets" height="24" width="50" user_resize="false" visibility_control="ToolbarVisiblePathfindingLinksets">
+      <button bottom="0" height="24" label="Linksets" name="pathing_linksets_btn" image_overlay="icn_toolbar_pathing_linksets.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="pathfinding_linksets"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panel10" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleBuild">
+      <button bottom="0" height="24" label="Build" name="build_btn" image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Create new objects. (B)" width="50" follows="left|right" control_name="BuildBtnState">
+        <button.commit_callback function="ShowFloater" parameter="build"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelgridoptions" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleGridOptions">
+      <button bottom="0" height="24" label="Grid Options" name="grid_options_btn" image_overlay="icn_toolbar_grid_options.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="grid options"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panellocalassets" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleLocalAssets">
+      <button bottom="0" height="24" label="Local Textures" name="local_textures_btn" image_overlay="icn_toolbar_local_assets.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="local assets"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelpermprefs" height="24" width="50" user_resize="false" visibility_control="ToolbarVisiblePermPrefs">
+      <button bottom="0" height="24" label="Upload Perms" name="perm_prefs_btn" image_overlay="icn_toolbar_upload_perms.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="perm prefs"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelscripterrors" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleScriptErrors">
+      <button bottom="0" height="24" label="Script Errors" name="script_errors_btn" image_overlay="icn_toolbar_script_errors.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="script errors"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelenvsettings" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleEnvSettings">
+      <button bottom="0" height="24" label="Environment Editor" name="env_editor_btn" image_overlay="icn_toolbar_env_editor.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="EnvSettings"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneldaycycle" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleDayCycle">
+      <button bottom="0" height="24" label="Day Cycle Editor" name="day_cycle_editor_btn" image_overlay="icn_toolbar_day_cycle_editor.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="DayCycle"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelwindlight" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleWindlight">
+      <button bottom="0" height="24" label="Windlight" name="windlight_btn" image_overlay="icn_toolbar_windlight.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="Windlight"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelwatersettings" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleWaterSettings">
+      <button bottom="0" height="24" label="Water Editor" name="water_editor_btn" image_overlay="icn_toolbar_water_editor.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="WaterSettings"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelpostprocess" height="24" width="50" user_resize="false" visibility_control="ToolbarVisiblePostProcess">
+      <button bottom="0" height="24" label="Post-Process FX" name="post_process_btn" image_overlay="icn_toolbar_post_process.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="PostProcess"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelbuycurrency" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleBuyCurrency">
+      <button bottom="0" height="24" label="Buy [CURRENCY]" name="buy_currency_btn" image_overlay="icn_toolbar_buy_currency.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="buy currency"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelbuyland" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleBuyLand">
+      <button bottom="0" height="24" label="Buy Land" name="buy_land_btn" image_overlay="icn_toolbar_buy_land.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="buy land"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelmyland" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMyLand">
+      <button bottom="0" height="24" label="My Land" name="my_land_btn" image_overlay="icn_toolbar_my_land.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="my land"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelaboutland" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAboutLand">
+      <button bottom="0" height="24" label="About Land" name="about_land_btn" image_overlay="icn_toolbar_about_land.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="about land"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelscriptinfo" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleScriptInfo">
+      <button bottom="0" height="24" label="Script Info" name="script_info_btn" image_overlay="icn_toolbar_script_info.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="script info"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelaboutregion" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAboutRegion">
+      <button bottom="0" height="24" label="Region/Estate" name="about_region_btn" image_overlay="icn_toolbar_about_region.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="about region"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelgodtools" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleGodTools">
+      <button bottom="0" height="24" label="God Tools" name="god_tools_btn" image_overlay="icn_toolbar_god_tools.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="god tools"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelteleporthistory" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleTeleportHistory">
+      <button bottom="0" height="24" label="TP History" name="teleport_history_btn" image_overlay="icn_toolbar_teleport_history.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="teleport history"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panel11" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleWorldMap">
+      <button bottom="0" height="24" label="Map" name="map_btn" image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" control_name="ShowWorldMap">
+        <button.commit_callback function="ShowFloater" parameter="world map"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panel12" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMiniMap">
+      <button bottom="0" height="24" label="Mini-Map" image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)" width="50" follows="left|right" control_name="ShowMiniMap">
+        <button.commit_callback function="ShowFloater" parameter="mini map"/>
+      </button>
+    </layout_panel>
+    <!-- [RLVa:LF] -->
+    <layout_panel name="panelrlvrestrictions" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleRLVRestrictions">
+      <button bottom="0" height="24" label="Restrictions" name="rlv_restrictions_btn" image_overlay="icn_toolbar_rlv_restrictions.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="rlv restrictions"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelrlvlocks" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleRLVLocks">
+      <button bottom="0" height="24" label="RLVa Locks" name="rlv_locks_btn" image_overlay="icn_toolbar_rlv_locks.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="rlv locks"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelrlvstrings" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleRLVStrings">
+      <button bottom="0" height="24" label="RLVa Strings" name="rlv_strings_btn" image_overlay="icn_toolbar_rlv_strings.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="rlv strings"/>
+      </button>
+    </layout_panel>
+    <!-- [/RLVa:LF] -->
+    <layout_panel name="panelmemleak" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMemLeak">
+      <button bottom="0" height="24" label="Memory Leak" name="memleak_btn" image_overlay="icn_toolbar_memleak.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Dear Gawd, I hope you know what you're doing." width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="memleak"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelmessagelog" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMessageLog">
+      <button bottom="0" height="24" label="Message Log" name="message_log_btn" image_overlay="icn_toolbar_message_log.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="messagelog"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelstats" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleStatBar">
+      <button bottom="0" height="24" label="Statistics" name="stats_btn" image_overlay="icn_toolbar_stats.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="stat bar"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelnotificationsconsole" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleNotificationsConsole">
+      <button bottom="0" height="24" label="Notifications Console" name="notifications_console_btn" image_overlay="icn_toolbar_notifications_console.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="notifications console"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneldebugconsole" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleDebugConsole">
+      <button bottom="0" height="24" label="Debug Console" name="debug_console_btn" image_overlay="icn_toolbar_debug_console.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="debug console"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelregiondebug" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleRegionDebugConsole">
+      <button bottom="0" height="24" label="Region Console" name="region_console_btn" image_overlay="icn_toolbar_region_console.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="RegionDebugConsole"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelfasttimers" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleFastTimers">
+      <button bottom="0" height="24" label="Fast Timers" name="fast_timers_btn" image_overlay="icn_toolbar_fast_timers.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="fast timers"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelframeconsole" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleFrameConsole">
+      <button bottom="0" height="24" label="Frame Console" name="frame_console_btn" image_overlay="icn_toolbar_frame_console.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="frame console"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelhttpconsole" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleHTTPConsole">
+      <button bottom="0" height="24" label="HTTP Console" name="http_console_btn" image_overlay="icn_toolbar_http_console.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="http console"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneltextureconsole" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleTextureConsole">
+      <button bottom="0" height="24" label="Texture Console" name="texture_console_btn" image_overlay="icn_toolbar_texture_console.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="texture console"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneltexturecategoryconsole" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleTextureCategoryConsole">
+      <button bottom="0" height="24" label="Texture Category Console" name="texture_category_console_btn" image_overlay="icn_toolbar_texture_category_console.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="texture category console"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneltexturesizeconsole" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleTextureSizeConsole">
+      <button bottom="0" height="24" label="Texture Size Console" name="texture_size_console_btn" image_overlay="icn_toolbar_texture_size_console.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="texture size console"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panel13" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleInventory">
+      <button bottom="0" height="24" label="Inventory" image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" control_name="ShowInventory">
+        <button.commit_callback function="ShowFloater" parameter="inventory"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneloutfit" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleOutfit">
+      <button bottom="0" height="24" label="Make Outfit" name="make_outfit_btn" image_overlay="icn_toolbar_make_outfit.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="outfit"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneloutfits" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleInventoryOutfits">
+      <button bottom="0" height="24" label="Outfits" image_overlay="icn_toolbar_outfits.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="outfits_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="floater_my_outfits.xml"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelfavs" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleInventoryFavs">
+      <button bottom="0" height="24" label="Favorites" image_overlay="icn_toolbar_favorites.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="favs_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="floater_inventory_favs.xml"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneloutbox" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleOutbox">
+      <button bottom="0" height="24" label="Outbox" image_overlay="icn_toolbar_outbox.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="outbox_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="outbox"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelpreferences" height="24" width="50" user_resize="false" visibility_control="ToolbarVisiblePreferences">
+      <button bottom="0" height="24" label="Preferences" name="preferences_btn" tool_tip="Ctrl-P" image_overlay="icn_toolbar_preferences.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="Preferences"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneldisplayname" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleDisplayName">
+      <button bottom="0" height="24" label="Display Name" name="display_name_btn" image_overlay="icn_toolbar_display_name.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="displayname"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneltest" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleTest">
+      <button bottom="0" height="24" label="Floater Test" name="floater_test_btn" image_overlay="icn_toolbar_test.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="test"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneleditui" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleEditUI">
+      <button bottom="0" height="24" label="Edit UI" name="edit_ui_btn" image_overlay="icn_toolbar_edit_ui.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="edit ui"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelfonttest" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleFontTest">
+      <button bottom="0" height="24" label="Font Test" name="font_test_btn" image_overlay="icn_toolbar_font_test.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="font test"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panellagmeter" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleLagMeter">
+      <button bottom="0" height="24" label="Lag Meter" image_overlay="icn_toolbar_lag_meter.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="lag_meter_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="lag meter"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelreportabuse" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleComplaintReporter">
+      <button bottom="0" height="24" label="Report Abuse" image_overlay="icn_toolbar_report_abuse.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="lag_meter_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="complaint reporter"/>
+      </button>
+    </layout_panel>
+    <!-- Singu TODO: Re-implement f1 help.
+    <layout_panel name="panelhelp" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleHelp">
+      <button bottom="0" height="24" label="Help" image_overlay="icn_toolbar_help.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="help_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="help f1"/>
+      </button>
+    </layout_panel>
+    -->
+    <layout_panel name="panelhelptutorial" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleHelpTutorial">
+      <button bottom="0" height="24" label="Tutorial" image_overlay="icn_toolbar_tutorial.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="tutorial_btn" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="help tutorial"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="panelabout" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAbout">
+      <button bottom="0" height="24" label="About [SHORT_APP_NAME]" name="about_btn" image_overlay="icn_toolbar_about_viewer.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="about"/>
+      </button>
+    </layout_panel>
+    <layout_panel name="paneltoolbarprefs" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleToolbarPrefs">
+      <button bottom="0" height="24" label="Change Buttons" name="change_buttons_btn" image_overlay="icn_toolbar_change_buttons.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="floater_toolbar_prefs.xml"/>
+      </button>
+    </layout_panel>
   </layout_stack>
 </panel>

indra/newview/skins/default/xui/en-us/strings.xml

@@ -27,6 +27,7 @@ Make sure you entered the correct Login URI. An example of a Login URI is: \"htt
 	<string name="SECOND_LIFE">Second Life</string>
 	<string name="APP_NAME">Singularity Viewer</string>
 	<string name="CAPITALIZED_APP_NAME">SINGULARITY VIEWER</string>
+	<string name="SHORT_APP_NAME">Singularity</string>
 	<string name="SECOND_LIFE_GRID">Second Life Grid</string>
 	<string name="SUPPORT_SITE">Second Life Support Portal</string>
 
@@ -66,7 +67,7 @@ Make sure you entered the correct Login URI. An example of a Login URI is: \"htt
 	<string name="LoginRetrySeedCapGrant">Requesting region capabilities, attempt [NUMBER]...</string>
 	<string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>
 	<string name="LoginConnectingToRegion">Connecting to region...</string>
-	<string name="LoginDownloadingClothing">Downloading clothing...</string>
+	<string name="LoginDownloadingClothing">Dry cleaning clothing...</string>
 
 	<string name="LoginFailed">Login failed.</string>
 	<string name="Quit">Quit</string>