Ensuring that the new path state radio items are properly enabled/disabled based on selection.

2 files changed, 18 insertions, 0 deletions

diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 938c961ad2..972e70f5d9 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -656,6 +656,15 @@ BOOL LLFloaterPathfindingLinksets::postBuild()
 	mEditPathState = findChild<LLRadioGroup>("edit_path_state");

 	llassert(mEditPathState != NULL);

 

+	mEditPathStateWalkable = findChild<LLUICtrl>("edit_pathing_state_walkable");

+	llassert(mEditPathStateWalkable != NULL);

+

+	mEditPathStateObstacle = findChild<LLUICtrl>("edit_pathing_state_obstacle");

+	llassert(mEditPathStateObstacle != NULL);

+

+	mEditPathStateIgnored = findChild<LLUICtrl>("edit_pathing_state_ignored");

+	llassert(mEditPathStateIgnored != NULL);

+

 	mLabelWalkabilityCoefficients = findChild<LLTextBase>("walkability_coefficients_label");

 	llassert(mLabelWalkabilityCoefficients != NULL);

 

@@ -746,6 +755,9 @@ LLFloaterPathfindingLinksets::LLFloaterPathfindingLinksets(const LLSD& pSeed)
 	mFilterByObstacle(NULL),

 	mFilterByIgnored(NULL),

 	mEditPathState(NULL),

+	mEditPathStateWalkable(NULL),

+	mEditPathStateObstacle(NULL),

+	mEditPathStateIgnored(NULL),

 	mLabelWalkabilityCoefficients(NULL),

 	mLabelEditA(NULL),

 	mLabelEditB(NULL),

@@ -1223,6 +1235,9 @@ void LLFloaterPathfindingLinksets::applyEditFields()
 void LLFloaterPathfindingLinksets::setEnableEditFields(BOOL pEnabled)

 {

 	mEditPathState->setEnabled(pEnabled);

+	mEditPathStateWalkable->setEnabled(pEnabled);

+	mEditPathStateObstacle->setEnabled(pEnabled);

+	mEditPathStateIgnored->setEnabled(pEnabled);

 	mLabelWalkabilityCoefficients->setEnabled(pEnabled);

 	mLabelEditA->setEnabled(pEnabled);

 	mLabelEditB->setEnabled(pEnabled);

diff --git a/indra/newview/llfloaterpathfindinglinksets.h b/indra/newview/llfloaterpathfindinglinksets.h
index 915d799079..48ea99df7d 100644
--- a/indra/newview/llfloaterpathfindinglinksets.h
+++ b/indra/newview/llfloaterpathfindinglinksets.h
@@ -208,6 +208,9 @@ private:
 	LLCheckBoxCtrl      *mFilterByObstacle;

 	LLCheckBoxCtrl      *mFilterByIgnored;

 	LLRadioGroup        *mEditPathState;

+	LLUICtrl            *mEditPathStateWalkable;

+	LLUICtrl            *mEditPathStateObstacle;

+	LLUICtrl            *mEditPathStateIgnored;

 	LLTextBase          *mLabelWalkabilityCoefficients;

 	LLTextBase          *mLabelEditA;

 	LLTextBase          *mLabelEditB;