Exposed star(valid/invalid) and test path colors. Refactored path drawing code to use ll f()'s

3 files changed, 96 insertions, 7 deletions

diff --git a/autobuild.xml b/autobuild.xml
index cae4fbe54e..073a35a4b7 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1110,9 +1110,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>eafee0cd7753fa6dcebe80e9a4339207</string>
+              <string>da502f834ac0fe7a29fdb688288f3316</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252400/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120328.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252424/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120329.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -1122,9 +1122,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>391e3db883dbc26c84856333989b36cf</string>
+              <string>335195df8bf4c79161cc154ffede1413</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252400/arch/Linux/installer/llphysicsextensions-0.1-linux-20120329.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252424/arch/Linux/installer/llphysicsextensions-0.1-linux-20120329.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -1134,9 +1134,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>38d3c076a0b6be7cff52ddcd1abdeeca</string>
+              <string>2a1128e6e2c3cdbf7f904fd5f17b88de</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252400/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120328.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252424/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120329.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4c673e08db..9dcf43cd8d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13765,6 +13765,83 @@
       <key>Value</key>
       <real>255</real>
     </map>	
-
+	 <key>StarValidColorRGB</key>
+    <map>
+      <key>Comment</key>
+      <string>yay!</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3</string>
+      <key>Value</key>
+      <array>
+        <real>214.0</real>
+        <real>212.0</real>
+        <real>212.0</real>
+      </array>
+    </map>
+ <key>StarValidColorA</key>
+    <map>
+      <key>Comment</key>
+      <string>yay!</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>255</real>
+    </map>	
+     <key>StarInvalidRGB</key>
+    <map>
+      <key>Comment</key>
+      <string>yay!</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3</string>
+      <key>Value</key>
+      <array>
+        <real>255.0</real>
+        <real>0.0</real>
+        <real>255.0</real>
+      </array>
+    </map>
+ <key>StarInvalidA</key>
+    <map>
+      <key>Comment</key>
+      <string>yay!</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>255</real>
+    </map>	
+	 <key>TestPathColorRGB</key>
+    <map>
+      <key>Comment</key>
+      <string>yay!</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3</string>
+      <key>Value</key>
+      <array>
+        <real>96.0</real>
+        <real>96.0</real>
+        <real>96.0</real>
+      </array>
+    </map>
+ <key>TestPathColorA</key>
+    <map>
+      <key>Comment</key>
+      <string>yay!</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>255</real>
+    </map>		
 </map>
 </llsd>
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index fd50b4370e..1f73f10b9b 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -1051,6 +1051,18 @@ void LLFloaterPathfindingConsole::fillInColorsForNavMeshVisualization()
 	a  = gSavedSettings.getF32("FaceColorA");

 	colors.mFaceColor= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a ); 	

 

+	in = gSavedSettings.getVector3("StarValidColorRGB");

+	a  = gSavedSettings.getF32("StarValidColorA");

+	colors.mStarValid= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a ); 	

+

+	in = gSavedSettings.getVector3("StarInvalidRGB");

+	a  = gSavedSettings.getF32("StarInvalidA");

+	colors.mStarInvalid= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a ); 	

+

+	in = gSavedSettings.getVector3("TestPathColorRGB");

+	a  = gSavedSettings.getF32("TestPathColorA");

+	colors.mTestPath= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a ); 	

+

 	in = gSavedSettings.getVector3("NavMeshClearRGB");

 	colors.mNavMeshClear= LLColor4(in[0], in[1], in[2], 0);