summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--autobuild.xml12
-rw-r--r--indra/newview/app_settings/settings.xml37
-rw-r--r--indra/newview/llfloaterpathfindingconsole.cpp14
-rw-r--r--indra/newview/llfloaterpathfindingconsole.h2
-rw-r--r--indra/newview/pipeline.cpp2
5 files changed, 22 insertions, 45 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 6b50009b5f..c410accce0 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1110,9 +1110,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a0ffbab517a9f5b1008586971824bb4a</string>
+ <string>f51d20e8a192d10bedd295e1d88d7d92</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/254138/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120418.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/254191/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120419.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1122,9 +1122,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ac55e2722820ddcb3c587198e2bc12d2</string>
+ <string>bfe3b91ed0b43a45775195e16d629810</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/254138/arch/Linux/installer/llphysicsextensions-0.1-linux-20120419.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/254191/arch/Linux/installer/llphysicsextensions-0.1-linux-20120419.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -1134,9 +1134,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>bb4cb29fcfd96ef742ebca9f636a6b0e</string>
+ <string>a9a3a49c3b4d823a957887dd0cf46af9</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/254138/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120418.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/254191/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120419.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 ab119e37fa..d702ae4766 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13527,23 +13527,12 @@
<key>Value</key>
<integer>99</integer>
</map>
- <key>EnableVBOForNavMeshVisualization</key>
- <map>
- <key>Comment</key>
- <string>Enable the use of VBOs for navmesh visualization.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>PathfindingNavMeshClear</key>
<map>
<key>Comment</key>
<string>Background color</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13559,7 +13548,7 @@
<key>Comment</key>
<string>Walkable color</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13575,7 +13564,7 @@
<key>Comment</key>
<string>Obstacle color</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13591,7 +13580,7 @@
<key>Comment</key>
<string>Material volume color</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13607,7 +13596,7 @@
<key>Comment</key>
<string>Exclusion volume color</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13623,7 +13612,7 @@
<key>Comment</key>
<string>Connected edge color</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13639,7 +13628,7 @@
<key>Comment</key>
<string>Boundary edge color</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13655,7 +13644,7 @@
<key>Comment</key>
<string>Least walkable heat map color</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13671,7 +13660,7 @@
<key>Comment</key>
<string>Most walkable heat map color</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13687,7 +13676,7 @@
<key>Comment</key>
<string>Nav mesh color?</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13703,7 +13692,7 @@
<key>Comment</key>
<string>yay!</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13719,7 +13708,7 @@
<key>Comment</key>
<string>yay!</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
@@ -13735,7 +13724,7 @@
<key>Comment</key>
<string>yay!</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 962ff74459..1e10e346a8 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -395,11 +395,6 @@ void LLFloaterPathfindingConsole::setRenderHeatmapType(LLPathingLib::LLPLCharact
mShowNavMeshWalkabilityComboBox->setValue(comboBoxValue);
}
-const LLColor4 &LLFloaterPathfindingConsole::getNavMeshBackgroundColor() const
-{
- return mNavMeshColors.mNavMeshClear;
-}
-
LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed)
: LLFloater(pSeed),
mSelfHandle(),
@@ -1003,11 +998,9 @@ void LLFloaterPathfindingConsole::fillInColorsForNavMeshVisualization()
in = gSavedSettings.getColor4("PathfindingBoundaryEdge");
mNavMeshColors.mBoundaryEdge= LLColor4U(in);
- in = gSavedSettings.getColor4("PathfindingHeatColorBase");
- mNavMeshColors.mHeatColorBase= LLVector4(in.mV);
+ mNavMeshColors.mHeatColorBase = gSavedSettings.getColor4("PathfindingHeatColorBase");
- in = gSavedSettings.getColor4("PathfindingHeatColorMax");
- mNavMeshColors.mHeatColorMax= LLVector4( in.mV );
+ mNavMeshColors.mHeatColorMax = gSavedSettings.getColor4("PathfindingHeatColorMax");
in = gSavedSettings.getColor4("PathfindingFaceColor");
mNavMeshColors.mFaceColor= LLColor4U(in);
@@ -1021,8 +1014,5 @@ void LLFloaterPathfindingConsole::fillInColorsForNavMeshVisualization()
in = gSavedSettings.getColor4("PathfindingTestPathColor");
mNavMeshColors.mTestPath= LLColor4U(in);
- in = gSavedSettings.getColor4("PathfindingNavMeshClear");
- mNavMeshColors.mNavMeshClear= LLColor4(in);
-
LLPathingLib::getInstance()->setNavMeshColors(mNavMeshColors);
}
diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index 47c5a9c80f..d81401c7ec 100644
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -88,8 +88,6 @@ public:
LLPathingLib::LLPLCharacterType getRenderHeatmapType() const;
void setRenderHeatmapType(LLPathingLib::LLPLCharacterType pRenderHeatmapType);
- const LLColor4 &getNavMeshBackgroundColor() const;
-
protected:
private:
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 02ef301fd0..ccc65fe412 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4353,7 +4353,7 @@ void LLPipeline::renderDebug()
if ( !pathfindingConsole->isRenderWorld() )
{
- const LLColor4 &clearColor = pathfindingConsole->getNavMeshBackgroundColor();
+ const LLColor4 clearColor = gSavedSettings.getColor4("PathfindingNavMeshClear");
gGL.setColorMask(true, true);
glClearColor(clearColor.mV[0],clearColor.mV[1],clearColor.mV[2],0);
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 05:16:48 +0000