From 78be5c3aa5f7263698bec5bcbccb24c150f78d09 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Mon, 9 Jun 2014 16:19:20 -0600
Subject: STORM-2026 - Use more unique syntax colors by default, also clean up
 some indentation

---
 indra/newview/llsyntaxid.cpp           | 28 ++++++++++++++--------------
 indra/newview/skins/default/colors.xml | 20 ++++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index 5b5bab85d0..236ad784ec 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -51,31 +51,31 @@ public:
 								  const std::string& reason,
 								  const LLSD& content)
 	{
-	LL_WARNS("SyntaxLSL") << "failed to fetch syntax file [status:" << status << "]: " << content << LL_ENDL;
+		LL_WARNS("SyntaxLSL") << "failed to fetch syntax file [status:" << status << "]: " << content << LL_ENDL;
 	}
 
 	virtual void result(const LLSD& content_ref)
 	{
-	// Continue only if a valid LLSD object was returned.
-	if (content_ref.isMap())
-	{
-		if (LLSyntaxIdLSL::getInstance()->isSupportedVersion(content_ref))
+		// Continue only if a valid LLSD object was returned.
+		if (content_ref.isMap())
 		{
-			LLSyntaxIdLSL::getInstance()->setKeywordsXml(content_ref);
+			if (LLSyntaxIdLSL::getInstance()->isSupportedVersion(content_ref))
+			{
+				LLSyntaxIdLSL::getInstance()->setKeywordsXml(content_ref);
 
-			cacheFile(content_ref);
-			LLSyntaxIdLSL::getInstance()->handleFileFetched(mFileSpec);
+				cacheFile(content_ref);
+				LLSyntaxIdLSL::getInstance()->handleFileFetched(mFileSpec);
+			}
+			else
+			{
+				LL_WARNS("SyntaxLSL") << "Unknown or unsupported version of syntax file." << LL_ENDL;
+			}
 		}
 		else
 		{
-			LL_WARNS("SyntaxLSL") << "Unknown or unsupported version of syntax file." << LL_ENDL;
+			LL_WARNS("SyntaxLSL") << "Syntax file '" << mFileSpec << "' contains invalid LLSD." << LL_ENDL;
 		}
 	}
-	else
-	{
-		LL_WARNS("SyntaxLSL") << "Syntax file '" << mFileSpec << "' contains invalid LLSD." << LL_ENDL;
-	}
-}
 
 	void cacheFile(const LLSD& content_ref)
 	{
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 464e633297..bdc884885f 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -917,32 +917,32 @@
     reference="Black" />
   <color
     name="SyntaxLslComment"
-    value=".8 .3 .15 1.0" />
+    value="0 0.5 0 1" />
   <color
     name="SyntaxLslConstant"
-    value=".3 .1 .5 1.0" />
+    value="0 0.6 0.6 1" />
   <color
     name="SyntaxLslControlFlow"
-    value="0 0 .8 1.0" />
+    value="0.4 0 0.8 1" />
   <color
     name="SyntaxLslControlLabel"
-    value="0 0 .8 1.0" />
+    value="0 0 0.8 1" />
   <color
     name="SyntaxLslDataType"
-    value=".1 .3 .1 1.0" />
+    value="0.8 0.4 0 1" />
    <color
     name="SyntaxLslDeprecated"
-    value="0.9 0.0 0.66, 1.0" />
+    value="0.9 0.0 0.66, 1" />
   <color
    name="SyntaxLslEvent"
-   value="0 .3 .5 1.0" />
+   value="0 0.3 0.5 1" />
   <color
    name="SyntaxLslFunction"
-   value=".3 0 .5 1.0" />
+   value="0.3 0 0.5 1" />
   <color
    name="SyntaxLslGodMode"
-   value="0.7 .2 .35 1.0" />
+   value="0.7 .2 .35 1" />
   <color
     name="SyntaxLslStringLiteral"
-    value="0 .2 0 1.0" />
+    value="1 0.14 0 1" />
 </colors>
-- 
cgit v1.2.3