From 12207b5f2ce14503064ea0af273303eec0cb2ce7 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 18 Apr 2012 18:34:54 -0700 Subject: Ensuring that the pathfinding console member variables are private with accessor functions where need be. --- indra/newview/llfloaterpathfindingconsole.cpp | 7 ++++++- indra/newview/llfloaterpathfindingconsole.h | 6 ++++-- indra/newview/pipeline.cpp | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index 92011a9524..9c2725e7e8 100644 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -390,7 +390,12 @@ void LLFloaterPathfindingConsole::setRenderHeatmapType(LLPathingLib::LLPLCharact break; } - return mShowNavMeshWalkabilityComboBox->setValue(comboBoxValue); + mShowNavMeshWalkabilityComboBox->setValue(comboBoxValue); +} + +const LLColor4 &LLFloaterPathfindingConsole::getNavMeshBackgroundColor() const +{ + return mNavMeshColors.mNavMeshClear; } LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed) diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h index 174ceb91ea..48ed3243e8 100644 --- a/indra/newview/llfloaterpathfindingconsole.h +++ b/indra/newview/llfloaterpathfindingconsole.h @@ -47,6 +47,7 @@ class LLTabContainer; class LLComboBox; class LLButton; class LLToolset; +class LLColor4; class LLFloaterPathfindingConsole : public LLFloater @@ -87,6 +88,8 @@ public: LLPathingLib::LLPLCharacterType getRenderHeatmapType() const; void setRenderHeatmapType(LLPathingLib::LLPLCharacterType pRenderHeatmapType); + const LLColor4 &getNavMeshBackgroundColor() const; + protected: private: @@ -185,8 +188,7 @@ private: static LLHandle sInstanceHandle; -public: - LLPathingLib::NavMeshColors mNavMeshColors; + LLPathingLib::NavMeshColors mNavMeshColors; }; #endif // LL_LLFLOATERPATHFINDINGCONSOLE_H diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d79812aa1b..02ef301fd0 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->mNavMeshColors.mNavMeshClear; + const LLColor4 &clearColor = pathfindingConsole->getNavMeshBackgroundColor(); 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); -- cgit v1.2.3