summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--autobuild.xml12
-rw-r--r--indra/newview/app_settings/settings.xml40
-rw-r--r--indra/newview/llfloaterpathfindingconsole.cpp6
-rw-r--r--indra/newview/pipeline.cpp3
4 files changed, 30 insertions, 31 deletions
diff --git a/autobuild.xml b/autobuild.xml
index d1e40df186..cae4fbe54e 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1110,9 +1110,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>f44da99067df0b9a9267d494d25dd0f8</string>
+ <string>eafee0cd7753fa6dcebe80e9a4339207</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252301/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/252400/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120328.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1122,9 +1122,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>65ba9f3a274cfbb77ce6473051a6d0e8</string>
+ <string>391e3db883dbc26c84856333989b36cf</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252301/arch/Linux/installer/llphysicsextensions-0.1-linux-20120328.tar.bz2</string>
+ <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>
</map>
<key>name</key>
<string>linux</string>
@@ -1134,9 +1134,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>967ce063e1a5767f03f98793bb39b7e8</string>
+ <string>38d3c076a0b6be7cff52ddcd1abdeeca</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252301/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/252400/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120328.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 37e4a43449..829a5b75b1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13526,9 +13526,9 @@
<string>Vector3</string>
<key>Value</key>
<array>
- <real>0.0</real>
- <real>0.0</real>
- <real>0.0</real>
+ <real>0.1960784313725490196078431372549</real>
+ <real>0.1960784313725490196078431372549</real>
+ <real>0.1960784313725490196078431372549</real>
</array>
</map>
<key>WalkableRGB</key>
@@ -13541,9 +13541,9 @@
<string>Vector3</string>
<key>Value</key>
<array>
+ <real>0.0</real>
<real>255.0</real>
- <real>255.0</real>
- <real>255.0</real>
+ <real>0.0</real>
</array>
</map>
<key>WalkableA</key>
@@ -13593,9 +13593,9 @@
<string>Vector3</string>
<key>Value</key>
<array>
- <real>255.0</real>
- <real>255.0</real>
+ <real>128.0</real>
<real>0.0</real>
+ <real>255.0</real>
</array>
</map>
<key>MaterialA</key>
@@ -13620,7 +13620,7 @@
<key>Value</key>
<array>
<real>255.0</real>
- <real>0.0</real>
+ <real>255.0</real>
<real>0.0</real>
</array>
</map>
@@ -13645,9 +13645,9 @@
<string>Vector3</string>
<key>Value</key>
<array>
- <real>0.0</real>
- <real>40.0</real>
- <real>114.0</real>
+ <real>220.0</real>
+ <real>220.0</real>
+ <real>220.0</real>
</array>
</map>
<key>ConnectedEdgeA</key>
@@ -13659,7 +13659,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>75</real>
+ <real>255</real>
</map>
<key>BoundaryEdgeRGB</key>
<map>
@@ -13671,7 +13671,7 @@
<string>Vector3</string>
<key>Value</key>
<array>
- <real>170.0</real>
+ <real>255.0</real>
<real>0.0</real>
<real>0.0</real>
</array>
@@ -13685,7 +13685,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>75</real>
+ <real>255</real>
</map>
<key>HeatColorBase</key>
<map>
@@ -13698,8 +13698,8 @@
<key>Value</key>
<array>
<real>0.0</real>
- <real>40.0</real>
- <real>114.0</real>
+ <real>1.0</real>
+ <real>0.5</real>
</array>
</map>
<key>HeatColorBaseA</key>
@@ -13711,7 +13711,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>75</real>
+ <real>1.0</real>
</map>
<key>HeatColorMax</key>
<map>
@@ -13724,8 +13724,8 @@
<key>Value</key>
<array>
<real>0.0</real>
- <real>40.0</real>
- <real>114.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
</array>
</map>
<key>HeatColorMaxA</key>
@@ -13737,7 +13737,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>75</real>
+ <real>1.0</real>
</map>
<key>FaceColorRGB</key>
<map>
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 40e4ab67e2..fd50b4370e 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -1041,18 +1041,18 @@ void LLFloaterPathfindingConsole::fillInColorsForNavMeshVisualization()
in = gSavedSettings.getVector3("HeatColorBase");
a = gSavedSettings.getF32("HeatColorBaseA");
- colors.mHeatColorBase= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
+ colors.mHeatColorBase= LLVector4(in, a);
in = gSavedSettings.getVector3("HeatColorMax");
a = gSavedSettings.getF32("HeatColorMaxA");
- colors.mHeatColorMax= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
+ colors.mHeatColorMax= LLVector4( in, a );
in = gSavedSettings.getVector3("FaceColorRGB");
a = gSavedSettings.getF32("FaceColorA");
colors.mFaceColor= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
in = gSavedSettings.getVector3("NavMeshClearRGB");
- colors.mNavMeshClear= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2], 0 );
+ colors.mNavMeshClear= LLColor4(in[0], in[1], in[2], 0);
mNavMeshColors = colors;
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 89824d9da6..3d4cf6afd9 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4344,8 +4344,7 @@ void LLPipeline::renderDebug()
}
else
{
- //glClearColor(0,0,0,0);
- LLColor4U clearColor = pathfindingConsole->mNavMeshColors.mNavMeshClear;
+ const LLColor4 &clearColor = pathfindingConsole->mNavMeshColors.mNavMeshClear;
glClearColor(clearColor.mV[0],clearColor.mV[1],clearColor.mV[2],0);
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 19:07:07 +0000