From 2d011abb6b09e35ab64b6133fbed8d617d2add88 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Thu, 19 Apr 2012 12:32:17 -0700 Subject: Cleaning up the navmesh colors a bit. --- indra/newview/llfloaterpathfindingconsole.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'indra/newview/llfloaterpathfindingconsole.cpp') 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); } -- cgit v1.2.3