From 8d9863f4ef039af4f6af7f41909e212b9101ce0f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 6 Apr 2012 13:37:11 -0700
Subject: Altering the layout of the pathfinding console based on feedback.

---
 indra/newview/llfloaterpathfindingbasic.cpp        |    6 +-
 indra/newview/llfloaterpathfindingcharacters.cpp   |   10 +-
 indra/newview/llfloaterpathfindingconsole.cpp      |   15 +-
 indra/newview/llfloaterpathfindinglinksets.cpp     |   13 +-
 indra/newview/skins/default/colors.xml             | 1601 ++++++++++----------
 .../default/xui/en/floater_pathfinding_console.xml |  423 +++---
 6 files changed, 1054 insertions(+), 1014 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterpathfindingbasic.cpp b/indra/newview/llfloaterpathfindingbasic.cpp
index d1103088ab..19d6742559 100644
--- a/indra/newview/llfloaterpathfindingbasic.cpp
+++ b/indra/newview/llfloaterpathfindingbasic.cpp
@@ -115,7 +115,7 @@ void LLFloaterPathfindingBasic::onAgentStateCB(LLPathfindingManager::EAgentState
 
 void LLFloaterPathfindingBasic::setAgentState(LLPathfindingManager::EAgentState pAgentState)
 {
-	static const LLColor4 warningColor = LLUIColorTable::instance().getColor("DrYellow");
+	static const LLColor4 errorColor = LLUIColorTable::instance().getColor("PathfindingErrorColor");
 	LLStyle::Params styleParams;
 
 	switch (pAgentState)
@@ -126,12 +126,12 @@ void LLFloaterPathfindingBasic::setAgentState(LLPathfindingManager::EAgentState
 		break;
 	case LLPathfindingManager::kAgentStateNotEnabled : 
 		mStatusText->setVisible(TRUE);
-		styleParams.color = warningColor;
+		styleParams.color = errorColor;
 		mStatusText->setText((LLStringExplicit)getString("status_pathfinding_not_enabled"), styleParams);
 		break;
 	case LLPathfindingManager::kAgentStateError : 
 		mStatusText->setVisible(TRUE);
-		styleParams.color = warningColor;
+		styleParams.color = errorColor;
 		mStatusText->setText((LLStringExplicit)getString("status_unable_to_change_state"), styleParams);
 		break;
 	default :
diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
index 6fc1b8f051..9998d25c7d 100644
--- a/indra/newview/llfloaterpathfindingcharacters.cpp
+++ b/indra/newview/llfloaterpathfindingcharacters.cpp
@@ -456,7 +456,8 @@ LLSD LLFloaterPathfindingCharacters::buildCharacterScrollListElement(const LLPat
 
 void LLFloaterPathfindingCharacters::updateStatusMessage()
 {
-	static const LLColor4 warningColor = LLUIColorTable::instance().getColor("DrYellow");
+	static const LLColor4 errorColor = LLUIColorTable::instance().getColor("PathfindingErrorColor");
+	static const LLColor4 warningColor = LLUIColorTable::instance().getColor("PathfindingWarningColor");
 
 	std::string statusText("");
 	LLStyle::Params styleParams;
@@ -465,13 +466,15 @@ void LLFloaterPathfindingCharacters::updateStatusMessage()
 	{
 	case kMessagingUnknown:
 		statusText = getString("characters_messaging_initial");
+		styleParams.color = errorColor;
 		break;
 	case kMessagingGetRequestSent :
 		statusText = getString("characters_messaging_get_inprogress");
+		styleParams.color = warningColor;
 		break;
 	case kMessagingGetError :
 		statusText = getString("characters_messaging_get_error");
-		styleParams.color = warningColor;
+		styleParams.color = errorColor;
 		break;
 	case kMessagingComplete :
 		if (mCharactersScrollList->isEmpty())
@@ -498,10 +501,11 @@ void LLFloaterPathfindingCharacters::updateStatusMessage()
 		break;
 	case kMessagingNotEnabled:
 		statusText = getString("characters_messaging_not_enabled");
-		styleParams.color = warningColor;
+		styleParams.color = errorColor;
 		break;
 	default:
 		statusText = getString("characters_messaging_initial");
+		styleParams.color = errorColor;
 		llassert(0);
 		break;
 	}
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index fd5403a7b7..d173764fd1 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -766,7 +766,8 @@ void LLFloaterPathfindingConsole::updateControlsOnConsoleState()
 
 void LLFloaterPathfindingConsole::updateStatusOnConsoleState()
 {
-	static const LLColor4 warningColor = LLUIColorTable::instance().getColor("DrYellow");
+	static const LLColor4 errorColor = LLUIColorTable::instance().getColor("PathfindingErrorColor");
+	static const LLColor4 warningColor = LLUIColorTable::instance().getColor("PathfindingWarningColor");
 
 	std::string simulatorStatusText("");
 	std::string viewerStatusText("");
@@ -777,20 +778,22 @@ void LLFloaterPathfindingConsole::updateStatusOnConsoleState()
 	case kConsoleStateUnknown :
 		simulatorStatusText = getString("navmesh_simulator_status_unknown");
 		viewerStatusText = getString("navmesh_viewer_status_unknown");
+		viewerStyleParams.color = errorColor;
 		break;
 	case kConsoleStateLibraryNotImplemented :
 		simulatorStatusText = getString("navmesh_simulator_status_unknown");
 		viewerStatusText = getString("navmesh_viewer_status_library_not_implemented");
-		viewerStyleParams.color = warningColor;
+		viewerStyleParams.color = errorColor;
 		break;
 	case kConsoleStateRegionNotEnabled :
 		simulatorStatusText = getString("navmesh_simulator_status_unknown");
 		viewerStatusText = getString("navmesh_viewer_status_region_not_enabled");
-		viewerStyleParams.color = warningColor;
+		viewerStyleParams.color = errorColor;
 		break;
 	case kConsoleStateCheckingVersion :
 		simulatorStatusText = getString("navmesh_simulator_status_unknown");
 		viewerStatusText = getString("navmesh_viewer_status_checking_version");
+		viewerStyleParams.color = warningColor;
 		break;
 	case kConsoleStateDownloading :
 		simulatorStatusText = getSimulatorStatusText();
@@ -802,6 +805,7 @@ void LLFloaterPathfindingConsole::updateStatusOnConsoleState()
 		{
 			viewerStatusText = getString("navmesh_viewer_status_downloading");
 		}
+		viewerStyleParams.color = warningColor;
 		break;
 	case kConsoleStateHasNavMesh :
 		simulatorStatusText = getSimulatorStatusText();
@@ -810,11 +814,12 @@ void LLFloaterPathfindingConsole::updateStatusOnConsoleState()
 	case kConsoleStateError :
 		simulatorStatusText = getString("navmesh_simulator_status_unknown");
 		viewerStatusText = getString("navmesh_viewer_status_error");
-		viewerStyleParams.color = warningColor;
+		viewerStyleParams.color = errorColor;
 		break;
 	default :
 		simulatorStatusText = getString("navmesh_simulator_status_unknown");
 		viewerStatusText = getString("navmesh_viewer_status_unknown");
+		viewerStyleParams.color = errorColor;
 		llassert(0);
 		break;
 	}
@@ -967,7 +972,7 @@ void LLFloaterPathfindingConsole::generatePath()
 
 void LLFloaterPathfindingConsole::updatePathTestStatus()
 {
-	static const LLColor4 warningColor = LLUIColorTable::instance().getColor("DrYellow");
+	static const LLColor4 warningColor = LLUIColorTable::instance().getColor("PathfindingWarningColor");
 
 	std::string statusText("");
 	LLStyle::Params styleParams;
diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index c2df53a31d..9701002d7d 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -864,7 +864,8 @@ bool LLFloaterPathfindingLinksets::isShowCannotBeVolumeWarning(LLPathfindingLink
 
 void LLFloaterPathfindingLinksets::updateStatusMessage()
 {
-	static const LLColor4 warningColor = LLUIColorTable::instance().getColor("DrYellow");
+	static const LLColor4 errorColor = LLUIColorTable::instance().getColor("PathfindingErrorColor");
+	static const LLColor4 warningColor = LLUIColorTable::instance().getColor("PathfindingWarningColor");
 
 	std::string statusText("");
 	LLStyle::Params styleParams;
@@ -873,20 +874,23 @@ void LLFloaterPathfindingLinksets::updateStatusMessage()
 	{
 	case kMessagingUnknown:
 		statusText = getString("linksets_messaging_initial");
+		styleParams.color = errorColor;
 		break;
 	case kMessagingGetRequestSent :
 		statusText = getString("linksets_messaging_get_inprogress");
+		styleParams.color = warningColor;
 		break;
 	case kMessagingGetError :
 		statusText = getString("linksets_messaging_get_error");
-		styleParams.color = warningColor;
+		styleParams.color = errorColor;
 		break;
 	case kMessagingSetRequestSent :
 		statusText = getString("linksets_messaging_set_inprogress");
+		styleParams.color = warningColor;
 		break;
 	case kMessagingSetError :
 		statusText = getString("linksets_messaging_set_error");
-		styleParams.color = warningColor;
+		styleParams.color = errorColor;
 		break;
 	case kMessagingComplete :
 		if (mLinksetsScrollList->isEmpty())
@@ -913,10 +917,11 @@ void LLFloaterPathfindingLinksets::updateStatusMessage()
 		break;
 	case kMessagingNotEnabled :
 		statusText = getString("linksets_messaging_not_enabled");
-		styleParams.color = warningColor;
+		styleParams.color = errorColor;
 		break;
 	default:
 		statusText = getString("linksets_messaging_initial");
+		styleParams.color = errorColor;
 		llassert(0);
 		break;
 	}
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index b616e2327b..a39e1a0511 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -1,825 +1,840 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <colors>
 
-	<!-- Named Colors -->
-	<color
-	 name="EmphasisColor"
-	 value="0.38 0.694 0.573 1" />
-	<color
-	 name="EmphasisColor_13"
-	 value="0.38 0.694 0.573 0.13" />
-	<color
-	 name="EmphasisColor_35"
-	 value="0.38 0.694 0.573 0.35" />
-	<color
-	 name="White"
-	 value="1 1 1 1" />
-	<color
-	 name="White_05"
-	 value="1 1 1 0.05" />
-	<color
-	 name="White_10"
-	 value="1 1 1 0.1" />
-	<color
-	 name="White_25"
-	 value="1 1 1 0.25" />
-	<color
-	 name="White_50"
-	 value="1 1 1 0.5" />
-	<color
-	 name="LtGray"
-	 value="0.75 0.75 0.75 1" />
-	<color
-	 name="LtGray_35"
-	 value="0.75 0.75 0.75 0.35" />
-	<color
-	 name="LtGray_50"
-	 value="0.75 0.75 0.75 0.50" />
-	<color
-	 name="Gray"
-	 value="0.5 0.5 0.5 1" />
-	<color
-	 name="DkGray"
-	 value="0.125 0.125 0.125 1" />
-	<color
-	 name="DkGray_66"
-	 value="0.125 0.125 0.125 .66" />
-	<color
-	 name="DkGray2"
-	 value="0.169 0.169 0.169 1" />
-	<color
-	 name="MouseGray"
-	 value="0.191 0.191 0.191 1" />
-	<color
-	 name="Black"
-	 value="0 0 0 1" />
-	<colork
-	 name="Black_10"
-	 value="0 0 0 0.1" />
-	<color
-	 name="Black_25"
-	 value="0 0 0 0.25" />
-	<color
-	 name="Black_50"
-	 value="0 0 0 0.5" />
-	<color
-	name="FrogGreen"
-	value="0.26 0.345 0.263 1" />
-	<color
-	 name="Red"
-	 value="1 0 0 1" />
-	<color
-	 name="Blue"
-	 value="0 0 1 1" />
-	<color
-	 name="Yellow"
-	 value="1 1 0 1" />
-	<color
-	 name="Green"
-	 value="0 1 0 1" />
-	<color
-	 name="Transparent"
-	 value="0 0 0 0" />
-	<color
-	name="Purple"
-	value="1 0 1 1" />
-	<color
-	name="Lime"
-	value=".8 1 .73 1" />
-	<color
-	name="LtYellow"
-	value="1 1 .79 1" />
-	<color
-	name="DrYellow"
-	value="1 0.86 0 1" />
-	<color
-	name="LtOrange"
-	value="1 .85 .73 1" />
-	<color
-	name="MdBlue"
-	value=".07 .38 .51 1" />
+  <!-- Named Colors -->
+  <color
+      name="EmphasisColor"
+      value="0.38 0.694 0.573 1" />
+  <color
+      name="EmphasisColor_13"
+      value="0.38 0.694 0.573 0.13" />
+  <color
+      name="EmphasisColor_35"
+      value="0.38 0.694 0.573 0.35" />
+  <color
+      name="White"
+      value="1 1 1 1" />
+  <color
+      name="White_05"
+      value="1 1 1 0.05" />
+  <color
+      name="White_10"
+      value="1 1 1 0.1" />
+  <color
+      name="White_25"
+      value="1 1 1 0.25" />
+  <color
+      name="White_50"
+      value="1 1 1 0.5" />
+  <color
+      name="LtGray"
+      value="0.75 0.75 0.75 1" />
+  <color
+      name="LtGray_35"
+      value="0.75 0.75 0.75 0.35" />
+  <color
+      name="LtGray_50"
+      value="0.75 0.75 0.75 0.50" />
+  <color
+      name="Gray"
+      value="0.5 0.5 0.5 1" />
+  <color
+      name="DkGray"
+      value="0.125 0.125 0.125 1" />
+  <color
+      name="DkGray_66"
+      value="0.125 0.125 0.125 .66" />
+  <color
+      name="DkGray2"
+      value="0.169 0.169 0.169 1" />
+  <color
+      name="MouseGray"
+      value="0.191 0.191 0.191 1" />
+  <color
+      name="Black"
+      value="0 0 0 1" />
+  <colork
+      name="Black_10"
+      value="0 0 0 0.1" />
+  <color
+      name="Black_25"
+      value="0 0 0 0.25" />
+  <color
+      name="Black_50"
+      value="0 0 0 0.5" />
+  <color
+      name="FrogGreen"
+      value="0.26 0.345 0.263 1" />
+  <color
+      name="Red"
+      value="1 0 0 1" />
+  <color
+      name="Blue"
+      value="0 0 1 1" />
+  <color
+      name="Yellow"
+      value="1 1 0 1" />
+  <color
+      name="Green"
+      value="0 1 0 1" />
+  <color
+      name="Transparent"
+      value="0 0 0 0" />
+  <color
+      name="Purple"
+      value="1 0 1 1" />
+  <color
+      name="Lime"
+      value=".8 1 .73 1" />
+  <color
+      name="LtYellow"
+      value="1 1 .79 1" />
+  <color
+      name="DrYellow"
+      value="1 0.86 0 1" />
+  <color
+      name="LtOrange"
+      value="1 .85 .73 1" />
+  <color
+      name="MdBlue"
+      value=".07 .38 .51 1" />
+  <color
+      name="LtRed"
+      value="1 0.2 0.2 1" />
+  <color
+      name="LtGreen"
+      value="0.2 1 0.2 1" />
 
   <!-- This color name makes potentially unused colors show up bright purple.
-  Leave this here until all Unused? are removed below, otherwise
-  the viewer generates many warnings on startup. -->
+       Leave this here until all Unused? are removed below, otherwise
+       the viewer generates many warnings on startup. -->
   <color
-	 name="Unused?"
-	 value=".831 1 0 1" />
+      name="Unused?"
+      value=".831 1 0 1" />
 
   <!-- UI Definitions -->
 
-    <color
-     name="AccordionHeaderTextColor"
-     reference="LtGray" />
-    <color
-     name="AgentChatColor"
-     reference="White" />
-    <color
-     name="AlertBoxColor"
-     value="0.24 0.24 0.24 1" />
-    <color
-     name="AlertCautionBoxColor"
-     value="1 0.82 0.46 1" />
-    <color
-     name="AlertCautionTextColor"
-     reference="LtYellow" />
-    <color
-     name="AvatarListItemIconDefaultColor"
-     reference="White" />
-    <color
-     name="AvatarListItemIconOnlineColor"
-     reference="White" />
-    <color
-     name="AvatarListItemIconOfflineColor"
-     value="0.5 0.5 0.5 0.5" />
-    <color
-     name="AvatarListItemIconVoiceInvitedColor"
-     reference="AvatarListItemIconOfflineColor" />
-    <color
-     name="AvatarListItemIconVoiceJoinedColor"
-     reference="AvatarListItemIconOnlineColor" />
-    <color
-     name="AvatarListItemIconVoiceLeftColor"
-     reference="AvatarListItemIconOfflineColor" />
-    <color
-     name="BadgeImageColor"
-     value="1.0 0.40 0.0 1.0" />
-    <color
-     name="BadgeBorderColor"
-     value="0.9 0.9 0.9 1.0" />
-    <color
-     name="BadgeLabelColor"
-     reference="White" />
-    <color
-     name="ButtonBorderColor"
-     reference="Unused?" />
-    <color
-     name="ButtonCautionImageColor"
-     reference="Unused?" />
-    <color
-     name="ButtonColor"
-     reference="Unused?" />
-    <color
-     name="ButtonFlashBgColor"
-     reference="Unused?" />
-    <color
-     name="ButtonImageColor"
-     reference="White" />
-    <color
-     name="ButtonLabelColor"
-     reference="LtGray" />
-    <color
-     name="ButtonLabelDisabledColor"
-     reference="White_25" />
-    <color
-     name="ButtonLabelSelectedColor"
-     reference="White" />
-    <color
-     name="ButtonLabelSelectedDisabledColor"
-     reference="White_25" />
-    <color
-     name="ButtonSelectedBgColor"
-     reference="Unused?" />
-    <color
-     name="ButtonSelectedColor"
-     reference="Unused?" />
-    <color
-     name="ButtonUnselectedBgColor"
-     reference="Unused?" />
-    <color
-     name="ButtonUnselectedFgColor"
-     reference="Unused?" />
-    <color
-     name="ChatHistoryBgColor"
-     reference="Transparent" />
-    <color
-     name="ChatHistoryTextColor"
-     reference="LtGray" />
-    <color
-     name="ChicletFlashColor"
-     value="0.114 0.65 0.1" />
-    <color
-     name="ColorDropShadow"
-     reference="Black_50" />
-    <color
-     name="ColorPaletteEntry01"
-     reference="Black" />
-    <color
-     name="ColorPaletteEntry02"
-     reference="Gray" />
-    <color
-     name="ColorPaletteEntry03"
-     value="0.5 0 0 1" />
-    <color
-     name="ColorPaletteEntry04"
-     value="0.5 0.5 0 1" />
-    <color
-     name="ColorPaletteEntry05"
-     value="0 0.5 0 1" />
-    <color
-     name="ColorPaletteEntry06"
-     value="0 0.5 0.5 1" />
-    <color
-     name="ColorPaletteEntry07"
-     value="0 0 0.5 1" />
-    <color
-     name="ColorPaletteEntry08"
-     value="0.5 0 0.5 1" />
-    <color
-     name="ColorPaletteEntry09"
-     value="0.5 0.5 0 1" />
-    <color
-     name="ColorPaletteEntry10"
-     value="0 0.25 0.25 1" />
-    <color
-     name="ColorPaletteEntry11"
-     value="0 0.5 1 1" />
-    <color
-     name="ColorPaletteEntry12"
-     value="0 0.25 0.5 1" />
-    <color
-     name="ColorPaletteEntry13"
-     value="0.5 0 1 1" />
-    <color
-     name="ColorPaletteEntry14"
-     value="0.5 0.25 0 1" />
-    <color
-     name="ColorPaletteEntry15"
-     reference="White" />
-    <color
-     name="ColorPaletteEntry16"
-     reference="LtYellow" />
-    <color
-     name="ColorPaletteEntry17"
-     reference="White" />
-    <color
-     name="ColorPaletteEntry18"
-     reference="LtGray" />
-    <color
-     name="ColorPaletteEntry19"
-     reference="Red" />
-    <color
-     name="ColorPaletteEntry20"
-     reference="Yellow" />
-    <color
-     name="ColorPaletteEntry21"
-     reference="Green" />
-    <color
-     name="ColorPaletteEntry22"
-     value="0 1 1 1" />
-    <color
-     name="ColorPaletteEntry23"
-     reference="Blue" />
-    <color
-     name="ColorPaletteEntry24"
-     reference="Purple" />
-    <color
-     name="ColorPaletteEntry25"
-     value="1 1 0.5 1" />
-    <color
-     name="ColorPaletteEntry26"
-     value="0 1 0.5 1" />
-    <color
-     name="ColorPaletteEntry27"
-     value="0.5 1 1 1" />
-    <color
-     name="ColorPaletteEntry28"
-     value="0.5 0.5 1 1" />
-    <color
-     name="ColorPaletteEntry29"
-     value="1 0 0.5 1" />
-    <color
-     name="ColorPaletteEntry30"
-     value="1 0.5 0 1" />
-    <color
-     name="ColorPaletteEntry31"
-     reference="White" />
-    <color
-     name="ColorPaletteEntry32"
-     reference="White" />
-    <color
-     name="ComboListBgColor"
-     reference="DkGray" />
-    <color
-     name="ConsoleBackground"
-     reference="Black" />
-    <color
-     name="ContextSilhouetteColor"
-     reference="EmphasisColor" />
-    <color
-     name="DefaultHighlightDark"
-     reference="White_10" />
-    <color
-     name="DefaultHighlightLight"
-     reference="White_25" />
-    <color
-     name="DefaultShadowDark"
-     reference="Black_50" />
-    <color
-     name="DefaultShadowLight"
-     reference="Black_50" />
-    <color
-     name="EffectColor"
-     reference="White" />
-     <color
-     name="FilterBackgroundColor"
-     reference="Black" />
-    <color
-     name="FilterTextColor"
-     value="0.38 0.69 0.57 1" />
-     <color
-     name="FloaterButtonImageColor"
-     reference="LtGray" />
-    <color
-     name="FloaterDefaultBackgroundColor"
-     reference="DkGray_66" />
-    <color
-     name="FloaterFocusBackgroundColor"
-     reference="DkGray2" />
-    <color
-     name="FloaterFocusBorderColor"
-     reference="Black_50" />
-    <color
-     name="FloaterUnfocusBorderColor"
-     reference="Black_50" />
-    <color
-     name="FocusColor"
-     reference="EmphasisColor" />
-    <color
-     name="FolderViewLoadingMessageTextColor"
-     value="0.3344 0.5456 0.5159 1" />
-    <color
-     name="GridFocusPointColor"
-     reference="White_50" />
-    <color
-     name="GridlineBGColor"
-     value="0.92 0.92 1 0.78" />
-    <color
-     name="GridlineColor"
-     reference="White" />
-    <color
-     name="GridlineShadowColor"
-     value="0 0 0 0.31" />
-    <color
-     name="GroupNotifyBoxColor"
-     value="0.3344 0.5456 0.5159 1" />
-    <color
-     name="GroupNotifyTextColor"
-     reference="White"/>
-    <color
-     name="GroupNotifyDimmedTextColor"
-     reference="LtGray" />
-    <color
-     name="GroupOverTierColor"
-     value="0.43 0.06 0.06 1" />
-    <color
-     name="HTMLLinkColor"
-     reference="EmphasisColor" />
-    <color
-     name="HealthTextColor"
-     reference="White" />
-    <color
-     name="HelpBgColor"
-     reference="Unused?" />
-    <color
-     name="HelpFgColor"
-     reference="Unused?" />
-    <color
-     name="HelpScrollHighlightColor"
-     reference="Unused?" />
-    <color
-     name="HelpScrollShadowColor"
-     reference="Unused?" />
-    <color
-     name="HelpScrollThumbColor"
-     reference="Unused?" />
-    <color
-     name="HelpScrollTrackColor"
-     reference="Unused?" />
-    <color
-     name="HighlightChildColor"
-     reference="Yellow" />
-    <color
-     name="HighlightInspectColor"
-     value="1 0 1 1" />
-    <color
-     name="HighlightParentColor"
-     value="0.67 0.83 0.96 1" />
-    <color
-     name="IMHistoryBgColor"
-     reference="Unused?" />
-    <color
-     name="IMHistoryTextColor"
-     reference="Unused?" />
-    <color
-     name="IconDisabledColor"
-	 reference="White_25" />
-    <color
-     name="IconEnabledColor"
-     reference="White" />
-    <color
-     name="InventoryBackgroundColor"
-     reference="DkGray2" />
-    <color
-     name="InventoryFocusOutlineColor"
-     reference="White_25" />
-    <color
-     name="InventoryItemSuffixColor"
-     reference="White_25" />
-    <color
-     name="InventoryItemLibraryColor"
-     reference="EmphasisColor" />
-    <color
-     name="InventoryItemLinkColor"
-     reference="LtGray_50" />
-    <color
-     name="InventoryMouseOverColor"
-     reference="LtGray_35" />
-    <color
-     name="InventorySearchStatusColor"
-     reference="EmphasisColor" />
-    <color
-     name="LabelDisabledColor"
-     reference="White_25" />
-    <color
-     name="LabelSelectedColor"
-     reference="White" />
-    <color
-     name="LabelSelectedDisabledColor"
-     reference="White_25" />
-    <color
-     name="LabelTextColor"
-     reference="LtGray" />
-    <color
-     name="LoginProgressBarBgColor"
-     reference="Unused?" />
-    <color
-     name="LoginProgressBarFgColor"
-     reference="Unused?" />
-    <color
-     name="LoginProgressBoxBorderColor"
-     value="0 0.12 0.24 0" />
-    <color
-     name="LoginProgressBoxCenterColor"
-     value="0 0 0 0.78" />
-    <color
-     name="LoginProgressBoxShadowColor"
-     value="0 0 0 0.78" />
-    <color
-     name="LoginProgressBoxTextColor"
-     reference="White" />
-    <color
-     name="MapAvatarColor"
-     reference="Green" />
-    <color
-     name="MapAvatarFriendColor"
-     reference="Yellow" />
-    <color
-     name="MapAvatarSelfColor"
-     value="0.53125 0 0.498047 1" />
-    <color
-     name="MapFrustumColor"
-     reference="White_10" />
-    <color
-     name="MapFrustumRotatingColor"
-     value="1 1 1 0.2" />
-    <color
-     name="MapTrackColor"
-     reference="Red" />
-    <color
-     name="MapTrackDisabledColor"
-     value="0.5 0 0 1" />
-    <color
-     name="MenuBarBgColor"
-     reference="DkGray" />
-    <color
-     name="MenuBarGodBgColor"
-     reference="FrogGreen" />
-    <color
-     name="MenuDefaultBgColor"
-     reference="DkGray2" />
-    <color
-     name="MenuItemDisabledColor"
-	 reference="LtGray_50" />
-    <color
-     name="MenuItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="MenuItemHighlightBgColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="MenuItemHighlightFgColor"
-     reference="White" />
-    <color
-     name="MenuNonProductionBgColor"
-     reference="Black" />
-    <color
-     name="MenuNonProductionGodBgColor"
-     value="0.263 0.325 0.345 1" />
-    <color
-     name="MenuPopupBgColor"
-	  reference="DkGray2" />
-    <color
-     name="ModelUploaderLabels"
-     value="1 0.6 0 1" />	  
-    <color
-     name="MultiSliderDisabledThumbColor"
-     reference="Black" />
-    <color
-     name="MultiSliderThumbCenterColor"
-     reference="White" />
-    <color
-     name="MultiSliderThumbCenterSelectedColor"
-     reference="Green" />
-    <color
-     name="MultiSliderThumbOutlineColor"
-     reference="Unused?" />
-    <color
-     name="MultiSliderTrackColor"
-     reference="LtGray" />
-    <color
-     name="MultiSliderTriangleColor"
-     reference="Yellow" />
+  <color
+      name="AccordionHeaderTextColor"
+      reference="LtGray" />
+  <color
+      name="AgentChatColor"
+      reference="White" />
+  <color
+      name="AlertBoxColor"
+      value="0.24 0.24 0.24 1" />
+  <color
+      name="AlertCautionBoxColor"
+      value="1 0.82 0.46 1" />
+  <color
+      name="AlertCautionTextColor"
+      reference="LtYellow" />
+  <color
+      name="AvatarListItemIconDefaultColor"
+      reference="White" />
+  <color
+      name="AvatarListItemIconOnlineColor"
+      reference="White" />
+  <color
+      name="AvatarListItemIconOfflineColor"
+      value="0.5 0.5 0.5 0.5" />
+  <color
+      name="AvatarListItemIconVoiceInvitedColor"
+      reference="AvatarListItemIconOfflineColor" />
+  <color
+      name="AvatarListItemIconVoiceJoinedColor"
+      reference="AvatarListItemIconOnlineColor" />
+  <color
+      name="AvatarListItemIconVoiceLeftColor"
+      reference="AvatarListItemIconOfflineColor" />
+  <color
+      name="BadgeImageColor"
+      value="1.0 0.40 0.0 1.0" />
+  <color
+      name="BadgeBorderColor"
+      value="0.9 0.9 0.9 1.0" />
+  <color
+      name="BadgeLabelColor"
+      reference="White" />
+  <color
+      name="ButtonBorderColor"
+      reference="Unused?" />
+  <color
+      name="ButtonCautionImageColor"
+      reference="Unused?" />
+  <color
+      name="ButtonColor"
+      reference="Unused?" />
+  <color
+      name="ButtonFlashBgColor"
+      reference="Unused?" />
+  <color
+      name="ButtonImageColor"
+      reference="White" />
+  <color
+      name="ButtonLabelColor"
+      reference="LtGray" />
+  <color
+      name="ButtonLabelDisabledColor"
+      reference="White_25" />
+  <color
+      name="ButtonLabelSelectedColor"
+      reference="White" />
+  <color
+      name="ButtonLabelSelectedDisabledColor"
+      reference="White_25" />
+  <color
+      name="ButtonSelectedBgColor"
+      reference="Unused?" />
+  <color
+      name="ButtonSelectedColor"
+      reference="Unused?" />
+  <color
+      name="ButtonUnselectedBgColor"
+      reference="Unused?" />
+  <color
+      name="ButtonUnselectedFgColor"
+      reference="Unused?" />
+  <color
+      name="ChatHistoryBgColor"
+      reference="Transparent" />
+  <color
+      name="ChatHistoryTextColor"
+      reference="LtGray" />
+  <color
+      name="ChicletFlashColor"
+      value="0.114 0.65 0.1" />
+  <color
+      name="ColorDropShadow"
+      reference="Black_50" />
+  <color
+      name="ColorPaletteEntry01"
+      reference="Black" />
+  <color
+      name="ColorPaletteEntry02"
+      reference="Gray" />
+  <color
+      name="ColorPaletteEntry03"
+      value="0.5 0 0 1" />
+  <color
+      name="ColorPaletteEntry04"
+      value="0.5 0.5 0 1" />
+  <color
+      name="ColorPaletteEntry05"
+      value="0 0.5 0 1" />
+  <color
+      name="ColorPaletteEntry06"
+      value="0 0.5 0.5 1" />
+  <color
+      name="ColorPaletteEntry07"
+      value="0 0 0.5 1" />
+  <color
+      name="ColorPaletteEntry08"
+      value="0.5 0 0.5 1" />
+  <color
+      name="ColorPaletteEntry09"
+      value="0.5 0.5 0 1" />
+  <color
+      name="ColorPaletteEntry10"
+      value="0 0.25 0.25 1" />
+  <color
+      name="ColorPaletteEntry11"
+      value="0 0.5 1 1" />
+  <color
+      name="ColorPaletteEntry12"
+      value="0 0.25 0.5 1" />
+  <color
+      name="ColorPaletteEntry13"
+      value="0.5 0 1 1" />
+  <color
+      name="ColorPaletteEntry14"
+      value="0.5 0.25 0 1" />
+  <color
+      name="ColorPaletteEntry15"
+      reference="White" />
+  <color
+      name="ColorPaletteEntry16"
+      reference="LtYellow" />
+  <color
+      name="ColorPaletteEntry17"
+      reference="White" />
+  <color
+      name="ColorPaletteEntry18"
+      reference="LtGray" />
+  <color
+      name="ColorPaletteEntry19"
+      reference="Red" />
+  <color
+      name="ColorPaletteEntry20"
+      reference="Yellow" />
+  <color
+      name="ColorPaletteEntry21"
+      reference="Green" />
+  <color
+      name="ColorPaletteEntry22"
+      value="0 1 1 1" />
+  <color
+      name="ColorPaletteEntry23"
+      reference="Blue" />
+  <color
+      name="ColorPaletteEntry24"
+      reference="Purple" />
+  <color
+      name="ColorPaletteEntry25"
+      value="1 1 0.5 1" />
+  <color
+      name="ColorPaletteEntry26"
+      value="0 1 0.5 1" />
+  <color
+      name="ColorPaletteEntry27"
+      value="0.5 1 1 1" />
+  <color
+      name="ColorPaletteEntry28"
+      value="0.5 0.5 1 1" />
+  <color
+      name="ColorPaletteEntry29"
+      value="1 0 0.5 1" />
+  <color
+      name="ColorPaletteEntry30"
+      value="1 0.5 0 1" />
+  <color
+      name="ColorPaletteEntry31"
+      reference="White" />
+  <color
+      name="ColorPaletteEntry32"
+      reference="White" />
+  <color
+      name="ComboListBgColor"
+      reference="DkGray" />
+  <color
+      name="ConsoleBackground"
+      reference="Black" />
+  <color
+      name="ContextSilhouetteColor"
+      reference="EmphasisColor" />
+  <color
+      name="DefaultHighlightDark"
+      reference="White_10" />
+  <color
+      name="DefaultHighlightLight"
+      reference="White_25" />
+  <color
+      name="DefaultShadowDark"
+      reference="Black_50" />
+  <color
+      name="DefaultShadowLight"
+      reference="Black_50" />
+  <color
+      name="EffectColor"
+      reference="White" />
+  <color
+      name="FilterBackgroundColor"
+      reference="Black" />
+  <color
+      name="FilterTextColor"
+      value="0.38 0.69 0.57 1" />
+  <color
+      name="FloaterButtonImageColor"
+      reference="LtGray" />
+  <color
+      name="FloaterDefaultBackgroundColor"
+      reference="DkGray_66" />
+  <color
+      name="FloaterFocusBackgroundColor"
+      reference="DkGray2" />
+  <color
+      name="FloaterFocusBorderColor"
+      reference="Black_50" />
+  <color
+      name="FloaterUnfocusBorderColor"
+      reference="Black_50" />
+  <color
+      name="FocusColor"
+      reference="EmphasisColor" />
+  <color
+      name="FolderViewLoadingMessageTextColor"
+      value="0.3344 0.5456 0.5159 1" />
+  <color
+      name="GridFocusPointColor"
+      reference="White_50" />
+  <color
+      name="GridlineBGColor"
+      value="0.92 0.92 1 0.78" />
+  <color
+      name="GridlineColor"
+      reference="White" />
+  <color
+      name="GridlineShadowColor"
+      value="0 0 0 0.31" />
+  <color
+      name="GroupNotifyBoxColor"
+      value="0.3344 0.5456 0.5159 1" />
+  <color
+      name="GroupNotifyTextColor"
+      reference="White"/>
+  <color
+      name="GroupNotifyDimmedTextColor"
+      reference="LtGray" />
+  <color
+      name="GroupOverTierColor"
+      value="0.43 0.06 0.06 1" />
+  <color
+      name="HTMLLinkColor"
+      reference="EmphasisColor" />
+  <color
+      name="HealthTextColor"
+      reference="White" />
+  <color
+      name="HelpBgColor"
+      reference="Unused?" />
+  <color
+      name="HelpFgColor"
+      reference="Unused?" />
+  <color
+      name="HelpScrollHighlightColor"
+      reference="Unused?" />
+  <color
+      name="HelpScrollShadowColor"
+      reference="Unused?" />
+  <color
+      name="HelpScrollThumbColor"
+      reference="Unused?" />
+  <color
+      name="HelpScrollTrackColor"
+      reference="Unused?" />
+  <color
+      name="HighlightChildColor"
+      reference="Yellow" />
+  <color
+      name="HighlightInspectColor"
+      value="1 0 1 1" />
+  <color
+      name="HighlightParentColor"
+      value="0.67 0.83 0.96 1" />
+  <color
+      name="IMHistoryBgColor"
+      reference="Unused?" />
+  <color
+      name="IMHistoryTextColor"
+      reference="Unused?" />
+  <color
+      name="IconDisabledColor"
+      reference="White_25" />
+  <color
+      name="IconEnabledColor"
+      reference="White" />
+  <color
+      name="InventoryBackgroundColor"
+      reference="DkGray2" />
+  <color
+      name="InventoryFocusOutlineColor"
+      reference="White_25" />
+  <color
+      name="InventoryItemSuffixColor"
+      reference="White_25" />
+  <color
+      name="InventoryItemLibraryColor"
+      reference="EmphasisColor" />
+  <color
+      name="InventoryItemLinkColor"
+      reference="LtGray_50" />
+  <color
+      name="InventoryMouseOverColor"
+      reference="LtGray_35" />
+  <color
+      name="InventorySearchStatusColor"
+      reference="EmphasisColor" />
+  <color
+      name="LabelDisabledColor"
+      reference="White_25" />
+  <color
+      name="LabelSelectedColor"
+      reference="White" />
+  <color
+      name="LabelSelectedDisabledColor"
+      reference="White_25" />
+  <color
+      name="LabelTextColor"
+      reference="LtGray" />
+  <color
+      name="LoginProgressBarBgColor"
+      reference="Unused?" />
+  <color
+      name="LoginProgressBarFgColor"
+      reference="Unused?" />
+  <color
+      name="LoginProgressBoxBorderColor"
+      value="0 0.12 0.24 0" />
+  <color
+      name="LoginProgressBoxCenterColor"
+      value="0 0 0 0.78" />
+  <color
+      name="LoginProgressBoxShadowColor"
+      value="0 0 0 0.78" />
+  <color
+      name="LoginProgressBoxTextColor"
+      reference="White" />
+  <color
+      name="MapAvatarColor"
+      reference="Green" />
+  <color
+      name="MapAvatarFriendColor"
+      reference="Yellow" />
+  <color
+      name="MapAvatarSelfColor"
+      value="0.53125 0 0.498047 1" />
+  <color
+      name="MapFrustumColor"
+      reference="White_10" />
+  <color
+      name="MapFrustumRotatingColor"
+      value="1 1 1 0.2" />
+  <color
+      name="MapTrackColor"
+      reference="Red" />
+  <color
+      name="MapTrackDisabledColor"
+      value="0.5 0 0 1" />
+  <color
+      name="MenuBarBgColor"
+      reference="DkGray" />
+  <color
+      name="MenuBarGodBgColor"
+      reference="FrogGreen" />
+  <color
+      name="MenuDefaultBgColor"
+      reference="DkGray2" />
+  <color
+      name="MenuItemDisabledColor"
+      reference="LtGray_50" />
+  <color
+      name="MenuItemEnabledColor"
+      reference="LtGray" />
+  <color
+      name="MenuItemHighlightBgColor"
+      reference="EmphasisColor_35" />
+  <color
+      name="MenuItemHighlightFgColor"
+      reference="White" />
+  <color
+      name="MenuNonProductionBgColor"
+      reference="Black" />
+  <color
+      name="MenuNonProductionGodBgColor"
+      value="0.263 0.325 0.345 1" />
+  <color
+      name="MenuPopupBgColor"
+      reference="DkGray2" />
+  <color
+      name="ModelUploaderLabels"
+      value="1 0.6 0 1" />	  
+  <color
+      name="MultiSliderDisabledThumbColor"
+      reference="Black" />
+  <color
+      name="MultiSliderThumbCenterColor"
+      reference="White" />
+  <color
+      name="MultiSliderThumbCenterSelectedColor"
+      reference="Green" />
+  <color
+      name="MultiSliderThumbOutlineColor"
+      reference="Unused?" />
+  <color
+      name="MultiSliderTrackColor"
+      reference="LtGray" />
+  <color
+      name="MultiSliderTriangleColor"
+      reference="Yellow" />
   <!--
-    <color
+      <color
       name="NameTagBackground"
       value="0.85 0.85 0.85 0.80" />
-      -->
-    <color
+  -->
+  <color
       name="NameTagBackground"
       value="0 0 0 1" />
-    <color
-     name="NameTagChat"
-     reference="White" />
-    <color
-     name="NameTagFriend"
-     value="0.447 0.784 0.663 1" />
-    <color
-     name="NameTagLegacy"
-     reference="White" />
-    <color
-     name="NameTagMatch"
-     reference="White" />
-    <color
-     name="NameTagMismatch"
-     reference="White" />
-    <color
-     name="NetMapBackgroundColor"
-     value="0 0 0 1" />
-    <color
-     name="NetMapGroupOwnAboveWater"
-     reference="Purple" />
-    <color
-     name="NetMapGroupOwnBelowWater"
-     value="0.78 0 0.78 1" />
-    <color
-     name="NetMapOtherOwnAboveWater"
-     value="0.24 0.24 0.24 1" />
-    <color
-     name="NetMapOtherOwnBelowWater"
-     value="0.12 0.12 0.12 1" />
-    <color
-     name="NetMapYouOwnAboveWater"
-     value="0 1 1 1" />
-    <color
-     name="NetMapYouOwnBelowWater"
-     value="0 0.78 0.78 1" />
-    <color
-     name="NotifyBoxColor"
-     value="LtGray" />
-    <color
-     name="NotifyCautionBoxColor"
-     value="1 0.82 0.46 1" />
-    <color
-     name="NotifyCautionWarnColor"
-     reference="White" />
-    <color
-     name="NotifyTextColor"
-     reference="White" />
-    <color
-     name="ObjectBubbleColor"
-     reference="DkGray_66" />
-    <color
-     name="ObjectChatColor"
-     reference="EmphasisColor" />
-    <color
-     name="OverdrivenColor"
-     reference="Red" />
-    <color
-     name="PanelDefaultBackgroundColor"
-     reference="DkGray" />
-    <color
-     name="PanelDefaultHighlightLight"
-     reference="White_50" />
-    <color
-     name="PanelFocusBackgroundColor"
-     reference="DkGray2" />
-    <color
-     name="PanelNotificationBackground"
-     value="1 0.3 0.3 0" />
-    <color
-     name="ParcelHoverColor"
-     reference="White" />
-    <color
-     name="PieMenuBgColor"
-     value="0.24 0.24 0.24 0.59" />
-    <color
-     name="PieMenuLineColor"
-     value="0 0 0 0.5" />
-    <color
-     name="PieMenuSelectedColor"
-     value="0.72 0.72 0.74 0.3" />
-    <color
-     name="PropertyColorAuction"
-     value="0.5 0 1 0.4" />
-    <color
-     name="PropertyColorAvail"
-     reference="Transparent" />
-    <color
-     name="PropertyColorForSale"
-     value="1 0.5 0 0.4" />
-    <color
-     name="PropertyColorGroup"
-     value="0 0.72 0.72 0.4" />
-    <color
-     name="PropertyColorOther"
-     value="1 0 0 0.4" />
-    <color
-     name="PropertyColorSelf"
-     value="0 1 0 0.4" />
-    <color
-     name="ScriptBgReadOnlyColor"
-     value="0.39 0.39 0.39 1" />
-    <color
-     name="ScriptErrorColor"
-     reference="Red" />
-    <color
-     name="ScrollBGStripeColor"
-     reference="Transparent" />
-    <color
-     name="ScrollBgReadOnlyColor"
+  <color
+      name="NameTagChat"
+      reference="White" />
+  <color
+      name="NameTagFriend"
+      value="0.447 0.784 0.663 1" />
+  <color
+      name="NameTagLegacy"
+      reference="White" />
+  <color
+      name="NameTagMatch"
+      reference="White" />
+  <color
+      name="NameTagMismatch"
+      reference="White" />
+  <color
+      name="NetMapBackgroundColor"
+      value="0 0 0 1" />
+  <color
+      name="NetMapGroupOwnAboveWater"
+      reference="Purple" />
+  <color
+      name="NetMapGroupOwnBelowWater"
+      value="0.78 0 0.78 1" />
+  <color
+      name="NetMapOtherOwnAboveWater"
+      value="0.24 0.24 0.24 1" />
+  <color
+      name="NetMapOtherOwnBelowWater"
+      value="0.12 0.12 0.12 1" />
+  <color
+      name="NetMapYouOwnAboveWater"
+      value="0 1 1 1" />
+  <color
+      name="NetMapYouOwnBelowWater"
+      value="0 0.78 0.78 1" />
+  <color
+      name="NotifyBoxColor"
+      value="LtGray" />
+  <color
+      name="NotifyCautionBoxColor"
+      value="1 0.82 0.46 1" />
+  <color
+      name="NotifyCautionWarnColor"
+      reference="White" />
+  <color
+      name="NotifyTextColor"
+      reference="White" />
+  <color
+      name="ObjectBubbleColor"
+      reference="DkGray_66" />
+  <color
+      name="ObjectChatColor"
+      reference="EmphasisColor" />
+  <color
+      name="OverdrivenColor"
+      reference="Red" />
+  <color
+      name="PanelDefaultBackgroundColor"
+      reference="DkGray" />
+  <color
+      name="PanelDefaultHighlightLight"
+      reference="White_50" />
+  <color
+      name="PanelFocusBackgroundColor"
+      reference="DkGray2" />
+  <color
+      name="PanelNotificationBackground"
+      value="1 0.3 0.3 0" />
+  <color
+      name="ParcelHoverColor"
+      reference="White" />
+  <color
+      name="PathfindingErrorColor"
+      reference="LtRed" />
+  <color
+      name="PathfindingWarningColor"
+      reference="DrYellow" />
+  <color
+      name="PathfindingGoodColor"
+      reference="LtGreen" />
+  <color
+      name="PieMenuBgColor"
+      value="0.24 0.24 0.24 0.59" />
+  <color
+      name="PieMenuLineColor"
+      value="0 0 0 0.5" />
+  <color
+      name="PieMenuSelectedColor"
+      value="0.72 0.72 0.74 0.3" />
+  <color
+      name="PropertyColorAuction"
+      value="0.5 0 1 0.4" />
+  <color
+      name="PropertyColorAvail"
+      reference="Transparent" />
+  <color
+      name="PropertyColorForSale"
+      value="1 0.5 0 0.4" />
+  <color
+      name="PropertyColorGroup"
+      value="0 0.72 0.72 0.4" />
+  <color
+      name="PropertyColorOther"
+      value="1 0 0 0.4" />
+  <color
+      name="PropertyColorSelf"
+      value="0 1 0 0.4" />
+  <color
+      name="ScriptBgReadOnlyColor"
+      value="0.39 0.39 0.39 1" />
+  <color
+      name="ScriptErrorColor"
+      reference="Red" />
+  <color
+      name="ScrollBGStripeColor"
       reference="Transparent" />
-    <color
-     name="ScrollBgWriteableColor"
-     reference="White_05" />
-    <color
-     name="ScrollDisabledColor"
-     reference="White_25" />
-    <color
-     name="ScrollHighlightedColor"
-     reference="Unused?" />
-    <color
-     name="ScrollHoveredColor"
-     reference="EmphasisColor_13" />
-    <color
-     name="ScrollSelectedBGColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="ScrollSelectedFGColor"
-     reference="White" />
-    <color
-     name="ScrollUnselectedColor"
-     reference="LtGray" />
-    <color
-     name="ScrollbarThumbColor"
-     reference="White" />
-    <color
-     name="ScrollbarTrackColor"
-     reference="Black" />
-    <color
-     name="SelectedOutfitTextColor"
-     reference="EmphasisColor" />
-    <color
-     name="SilhouetteChildColor"
-     value="0.13 0.42 0.77 1" />
-    <color
-     name="SilhouetteParentColor"
-     reference="Yellow" />
-    <color
-     name="SliderDisabledThumbColor"
-     reference="White_25" />
-    <color
-     name="SliderThumbCenterColor"
-     reference="White" />
-    <color
-     name="SliderThumbOutlineColor"
-     reference="White" />
-    <color
-     name="SliderTrackColor"
-     reference="Unused?" />
-    <color
-     name="SpeakingColor"
-     reference="FrogGreen" />
-    <color
-     name="SystemChatColor"
-     reference="LtGray" />
-    <color
-     name="TextBgFocusColor"
-     reference="White" />
-    <color
-     name="TextBgReadOnlyColor"
-	 reference="White_05" />
-    <color
-     name="TextBgWriteableColor"
-     reference="LtGray" />
-    <color
-     name="TextCursorColor"
-     reference="Black" />
-    <color
-     name="TextDefaultColor"
-     reference="Black" />
-    <color
-     name="TextEmbeddedItemColor"
-     value="0 0 0.5 1" />
-    <color
-     name="TextEmbeddedItemReadOnlyColor"
-     reference="Unused?" />
-    <color
-     name="TextFgColor"
-     value="0.102 0.102 0.102 1" />
-    <color
-     name="TextFgReadOnlyColor"
-     reference="LtGray" />
-    <color
-     name="TextFgTentativeColor"
-     value="0.4 0.4 0.4 1" />
-    <color
-     name="TimeTextColor"
-     reference="LtGray" />
-    <color
-     name="TitleBarFocusColor"
-     reference="White_10" />
-    <color
-     name="ToastBackground"
-     value="0.3 0.3 0.3 0" />
-    <color
-     name="ToolTipBgColor"
-     value="0.937 0.89 0.655 1" />
-    <color
-     name="ToolTipBorderColor"
-     value="0.812 0.753 0.451 1" />
-    <color
-     name="ToolTipTextColor"
-     reference="DkGray2" />
-    <color
-     name="InspectorTipTextColor"
-     reference="LtGray" />
-    <color
-     name="UserChatColor"
-     reference="White" />
-    <color
-     name="llOwnerSayChatColor"
-     reference="LtYellow" />
+  <color
+      name="ScrollBgReadOnlyColor"
+      reference="Transparent" />
+  <color
+      name="ScrollBgWriteableColor"
+      reference="White_05" />
+  <color
+      name="ScrollDisabledColor"
+      reference="White_25" />
+  <color
+      name="ScrollHighlightedColor"
+      reference="Unused?" />
+  <color
+      name="ScrollHoveredColor"
+      reference="EmphasisColor_13" />
+  <color
+      name="ScrollSelectedBGColor"
+      reference="EmphasisColor_35" />
+  <color
+      name="ScrollSelectedFGColor"
+      reference="White" />
+  <color
+      name="ScrollUnselectedColor"
+      reference="LtGray" />
+  <color
+      name="ScrollbarThumbColor"
+      reference="White" />
+  <color
+      name="ScrollbarTrackColor"
+      reference="Black" />
+  <color
+      name="SelectedOutfitTextColor"
+      reference="EmphasisColor" />
+  <color
+      name="SilhouetteChildColor"
+      value="0.13 0.42 0.77 1" />
+  <color
+      name="SilhouetteParentColor"
+      reference="Yellow" />
+  <color
+      name="SliderDisabledThumbColor"
+      reference="White_25" />
+  <color
+      name="SliderThumbCenterColor"
+      reference="White" />
+  <color
+      name="SliderThumbOutlineColor"
+      reference="White" />
+  <color
+      name="SliderTrackColor"
+      reference="Unused?" />
+  <color
+      name="SpeakingColor"
+      reference="FrogGreen" />
+  <color
+      name="SystemChatColor"
+      reference="LtGray" />
+  <color
+      name="TextBgFocusColor"
+      reference="White" />
+  <color
+      name="TextBgReadOnlyColor"
+      reference="White_05" />
+  <color
+      name="TextBgWriteableColor"
+      reference="LtGray" />
+  <color
+      name="TextCursorColor"
+      reference="Black" />
+  <color
+      name="TextDefaultColor"
+      reference="Black" />
+  <color
+      name="TextEmbeddedItemColor"
+      value="0 0 0.5 1" />
+  <color
+      name="TextEmbeddedItemReadOnlyColor"
+      reference="Unused?" />
+  <color
+      name="TextFgColor"
+      value="0.102 0.102 0.102 1" />
+  <color
+      name="TextFgReadOnlyColor"
+      reference="LtGray" />
+  <color
+      name="TextFgTentativeColor"
+      value="0.4 0.4 0.4 1" />
+  <color
+      name="TimeTextColor"
+      reference="LtGray" />
+  <color
+      name="TitleBarFocusColor"
+      reference="White_10" />
+  <color
+      name="ToastBackground"
+      value="0.3 0.3 0.3 0" />
+  <color
+      name="ToolTipBgColor"
+      value="0.937 0.89 0.655 1" />
+  <color
+      name="ToolTipBorderColor"
+      value="0.812 0.753 0.451 1" />
+  <color
+      name="ToolTipTextColor"
+      reference="DkGray2" />
+  <color
+      name="InspectorTipTextColor"
+      reference="LtGray" />
+  <color
+      name="UserChatColor"
+      reference="White" />
+  <color
+      name="llOwnerSayChatColor"
+      reference="LtYellow" />
 
-    <!-- New Colors -->
-    <color
-     name="OutputMonitorMutedColor"
-     reference="DkGray2" />
-    <color
-     name="SysWellItemUnselected"
-     value="0 0 0 0" />
-    <color
-     name="SysWellItemSelected"
-     value="0.3 0.3 0.3 1.0" />
-    <color
-    name="ColorSwatchBorderColor"
-    value="0.45098 0.517647 0.607843 1"/>
-    <color
-     name="ChatTimestampColor"
-     reference="White" />
-    <color
-     name="MenuBarProjectBgColor"
-     reference="MdBlue" />
+  <!-- New Colors -->
+  <color
+      name="OutputMonitorMutedColor"
+      reference="DkGray2" />
+  <color
+      name="SysWellItemUnselected"
+      value="0 0 0 0" />
+  <color
+      name="SysWellItemSelected"
+      value="0.3 0.3 0.3 1.0" />
+  <color
+      name="ColorSwatchBorderColor"
+      value="0.45098 0.517647 0.607843 1"/>
+  <color
+      name="ChatTimestampColor"
+      reference="White" />
+  <color
+      name="MenuBarProjectBgColor"
+      reference="MdBlue" />
   
-    <color
+  <color
       name="MeshImportTableNormalColor"
       value="1 1 1 1"/>
-    <color
+  <color
       name="MeshImportTableHighlightColor"
       value="0.2 0.8 1 1"/>
 
-    <color
-     name="DirectChatColor"
-     reference="LtOrange" />
+  <color
+      name="DirectChatColor"
+      reference="LtOrange" />
 
-    <color
+  <color
       name="ToolbarDropZoneColor"
       value=".48 .69 1 .5" />
   
-    <!-- Generic color names (legacy) -->
+  <!-- Generic color names (legacy) -->
   <color
-    name="white"
-    value="1 1 1 1"/>
+      name="white"
+      value="1 1 1 1"/>
   <color
-    name="black"
-    value="0 0 0 1"/>
+      name="black"
+      value="0 0 0 1"/>
   <color
-    name="red"
-    value="1 0 0 1"/>
+      name="red"
+      value="1 0 0 1"/>
   <color
-    name="green"
-    value="0 1 0 1"/>
+      name="green"
+      value="0 1 0 1"/>
   <color
-    name="blue"
-    value="0 0 1 1"/>
+      name="blue"
+      value="0 0 1 1"/>
 </colors>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 707b06c643..09fe5f4bc7 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="448"
+    height="406"
     layout="topleft"
     name="floater_pathfinding_console"
     help_topic="floater_pathfinding_console"
@@ -31,136 +31,14 @@
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
   <floater.string name="pathing_path_valid">Path is shown in orange.</floater.string>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="15"
-      top="9"
-      width="208">
-    Show:
-  </text>
-  <check_box
-      height="19"
-      label="Navmesh"
-      layout="topleft"
-      left="14"
-      name="show_navmesh"
-      top_pad="7"
-      width="90" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      text_readonly_color="LabelDisabledColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="35"
-      width="188">
-    Show walkability map:
-  </text>
-  <combo_box
-      height="19"
-      layout="topleft"
-      left="34"
-      name="show_heatmap_mode"
-      top_pad="8"
-      width="156">
-    <combo_box.item
-        label="Do not show"
-        name="show_heatmap_mode_none"
-        value="0" />
-    <combo_box.item
-        label="Character type A"
-        name="show_heatmap_mode_a"
-        value="1" />
-    <combo_box.item
-        label="Character type B"
-        name="show_heatmap_mode_b"
-        value="2" />
-    <combo_box.item
-        label="Character type C"
-        name="show_heatmap_mode_c"
-        value="3" />
-    <combo_box.item
-        label="Character type D"
-        name="show_heatmap_mode_d"
-        value="4" />
-  </combo_box>
-  <check_box
-      height="19"
-      label="Walkables"
-      layout="topleft"
-      left="14"
-      name="show_walkables"
-      top_pad="10"
-      tool_tip="Functionality is not implemented currently."
-      width="90" />
-  <check_box
-      height="19"
-      label="Material volumes"
-      layout="topleft"
-      left="14"
-      name="show_material_volumes"
-      top_pad="4"
-      tool_tip="Functionality is not implemented currently."
-      width="90" />
-  <check_box
-      height="19"
-      label="Static obstacles"
-      layout="topleft"
-      left="14"
-      name="show_static_obstacles"
-      top_pad="4"
-      tool_tip="Functionality is not implemented currently."
-      width="90" />
-  <check_box
-      height="19"
-      label="Exclusion volumes"
-      layout="topleft"
-      left="14"
-      name="show_exclusion_volumes"
-      top_pad="4"
-      width="90" />
-  <check_box
-      height="19"
-      label="World"
-      layout="topleft"
-      left="14"
-      name="show_world"
-      top_pad="4"
-      width="90" />
-  <check_box
-      height="19"
-      label="X-Ray"
-      layout="topleft"
-      left="14"
-      name="x-ray"
-      top_pad="4"
-      width="90" />
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      layout="topleft"
-      left="14"
-      height="0"
-      width="200"
-      top_pad="12"
-      visible="true" />
   <panel
       border="false"
       bevel_style="none"
       follows="left|top"
       layout="topleft"
-      height="73"
+      left="14"
+      top_pad="15"
+      height="68"
       width="200">
     <text
         height="13"
@@ -171,7 +49,7 @@
         length="1"
         layout="topleft"
         left="0"
-        top_pad="5"
+        top_pad="0"
         width="200">
       Viewer status
     </text>
@@ -180,7 +58,7 @@
         word_wrap="true"
         use_ellipses="false"
         type="string"
-        text_color="LabelTextColor"
+        text_color="PathfindingGoodColor"
         length="1"
         follows="left|top"
         layout="topleft"
@@ -204,74 +82,124 @@
       bevel_style="none"
       follows="left|top"
       layout="topleft"
-      height="73"
+      height="250"
       width="200">
     <text
-        height="13"
-        word_wrap="true"
-        use_ellipses="false"
-        type="string"
-        text_color="LabelTextColor"
-        length="1"
-        layout="topleft"
-        left="0"
-        top_pad="5"
-        width="200">
-      Simulator status
+	height="13"
+	word_wrap="true"
+	use_ellipses="false"
+	type="string"
+	text_color="LabelTextColor"
+	length="1"
+	follows="left|top"
+	layout="topleft"
+	top_pad="9"
+	width="200">
+      Show:
     </text>
+    <check_box
+        height="19"
+        label="Navmesh"
+        layout="topleft"
+        name="show_navmesh"
+        top_pad="7"
+        width="90" />
     <text
-        height="40"
+        height="13"
         word_wrap="true"
         use_ellipses="false"
         type="string"
         text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
         length="1"
         follows="left|top"
         layout="topleft"
-        left="0"
-        name="pathfinding_simulator_status"
-        top_pad="8"
-        width="200">
+        left="20"
+        width="180">
+      Show walkability map:
     </text>
+    <combo_box
+        height="19"
+        layout="topleft"
+        left="20"
+        name="show_heatmap_mode"
+        top_pad="8"
+        width="156">
+      <combo_box.item
+          label="Do not show"
+          name="show_heatmap_mode_none"
+          value="0" />
+      <combo_box.item
+          label="Character type A"
+          name="show_heatmap_mode_a"
+          value="1" />
+      <combo_box.item
+          label="Character type B"
+          name="show_heatmap_mode_b"
+          value="2" />
+      <combo_box.item
+          label="Character type C"
+          name="show_heatmap_mode_c"
+          value="3" />
+      <combo_box.item
+          label="Character type D"
+          name="show_heatmap_mode_d"
+          value="4" />
+    </combo_box>
+    <check_box
+        height="19"
+        label="Walkables"
+        layout="topleft"
+        left="0"
+        name="show_walkables"
+        top_pad="10"
+        tool_tip="Functionality is not implemented currently."
+        width="90" />
+    <check_box
+        height="19"
+        label="Material volumes"
+        layout="topleft"
+        name="show_material_volumes"
+        top_pad="4"
+        tool_tip="Functionality is not implemented currently."
+        width="90" />
+    <check_box
+        height="19"
+        label="Static obstacles"
+        layout="topleft"
+        name="show_static_obstacles"
+        top_pad="4"
+        tool_tip="Functionality is not implemented currently."
+        width="90" />
+    <check_box
+        height="19"
+        label="Exclusion volumes"
+        layout="topleft"
+        name="show_exclusion_volumes"
+        top_pad="4"
+        width="90" />
+    <check_box
+        height="19"
+        label="World"
+        layout="topleft"
+        name="show_world"
+        top_pad="4"
+        width="90" />
+    <check_box
+        height="19"
+        label="X-Ray"
+        layout="topleft"
+        name="x-ray"
+        top_pad="4"
+        width="90" />
   </panel>
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      layout="topleft"
-      left="14"
-      height="0"
-      width="200"
-      top_pad="0"
-      visible="true" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left="14"
-      top_pad="18"
-      width="250">
-    Lost characters? Bad performance?
-  </text>
-  <button
-      follows="left|top"
-      height="21"
-      label="Characters..."
-      layout="topleft"
-      name="view_characters_floater"
-      left_pad="0"
-      top_pad="-17"
-      width="96"/>
   <view_border
       bevel_style="none"
       follows="top|left"
       layout="topleft"
       left="230"
       top="35"
-      height="366"
+      height="247"
       width="214"
       visible="true" />
   <tab_container
@@ -281,7 +209,7 @@
       name="edit_test_tab_container"
       left="227"
       top="14"
-      height="388"
+      height="268"
       width="218">
     <panel
         border="false"
@@ -378,6 +306,41 @@
         left="1"
         name="test_panel"
         label="Test">
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          left="16"
+          follows="left|top"
+          layout="topleft"
+          top_pad="12"
+          width="190">
+        Ctrl-click to select start point.
+      </text>
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          top_pad="5"
+          width="190">
+        Shift-click to select end point.
+      </text>
+      <view_border
+          bevel_style="none"
+          follows="top|left"
+          layout="topleft"
+          height="0"
+          width="185"
+          top_pad="13"
+          visible="true" />
       <text
           height="14"
           word_wrap="true"
@@ -387,7 +350,6 @@
           length="1"
           follows="left|top"
           layout="topleft"
-          left="16"
           top_pad="14"
           width="190">
         Character width
@@ -465,33 +427,7 @@
           word_wrap="true"
           use_ellipses="false"
           type="string"
-          text_color="LabelTextColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          top_pad="12"
-          width="190">
-        Ctrl-click to select start point.
-      </text>
-      <text
-          height="14"
-          word_wrap="true"
-          use_ellipses="false"
-          type="string"
-          text_color="LabelTextColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          top_pad="5"
-          width="190">
-        Shift-click to select end point.
-      </text>
-      <text
-          height="14"
-          word_wrap="true"
-          use_ellipses="false"
-          type="string"
-          text_color="LabelTextColor"
+          text_color="PathfindingGoodColor"
           length="1"
           follows="left|top"
           layout="topleft"
@@ -509,4 +445,79 @@
           width="96"/>
     </panel>
   </tab_container>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      left="246"
+      height="73"
+      width="200">
+    <text
+        height="13"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        layout="topleft"
+        left="0"
+        top_pad="5"
+        width="200">
+      Simulator status
+    </text>
+    <text
+        height="40"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        name="pathfinding_simulator_status"
+        top_pad="8"
+        width="200">
+    </text>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      layout="topleft"
+      height="0"
+      left="14"
+      width="430"
+      top_pad="0"
+      visible="true" />
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      height="40"
+      top_pad="0"
+      width="400">
+    <text
+	height="13"
+	word_wrap="true"
+	use_ellipses="false"
+	type="string"
+	text_color="LabelTextColor"
+	length="1"
+	layout="topleft"
+	top_pad="18"
+	width="250">
+      Lost characters? Bad performance?
+    </text>
+    <button
+        follows="left|top"
+        height="21"
+        label="Characters..."
+        layout="topleft"
+        name="view_characters_floater"
+        left_pad="0"
+        top_pad="-17"
+        width="96"/>
+  </panel>
 </floater>
-- 
cgit v1.2.3