summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/settings.xml79
-rw-r--r--indra/newview/llfloaterpathfindingconsole.cpp12
2 files changed, 90 insertions, 1 deletions
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);