diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-19 13:50:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-19 13:50:10 -0400 |
| commit | da0b5fe998434a935027b5e7cca2b70b895f0673 (patch) | |
| tree | 538531439ee880365c681dd4a0652b312c3734f9 /indra/newview/llfloaterpathfindingcharacters.cpp | |
| parent | d7400ae60c0453e111357abfb09d8308adf8b721 (diff) | |
| parent | eb341068de59c86101aa4fd4031b6cdd7e4bbdc2 (diff) | |
merge up to latest viewer-development-havokai
Diffstat (limited to 'indra/newview/llfloaterpathfindingcharacters.cpp')
| -rw-r--r-- | indra/newview/llfloaterpathfindingcharacters.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp index b4a1394b06..60e66174f3 100644 --- a/indra/newview/llfloaterpathfindingcharacters.cpp +++ b/indra/newview/llfloaterpathfindingcharacters.cpp @@ -160,11 +160,11 @@ LLSD LLFloaterPathfindingCharacters::convertObjectsIntoScrollListData(const LLPa return scrollListData; } -void LLFloaterPathfindingCharacters::updateControls() +void LLFloaterPathfindingCharacters::updateControlsOnScrollListChange() { - LLFloaterPathfindingObjects::updateControls(); - updateOnScrollListChange(); - updateStateOnActionFields(); + LLFloaterPathfindingObjects::updateControlsOnScrollListChange(); + updateStateOnDisplayControls(); + showSelectedCharacterCapsules(); } S32 LLFloaterPathfindingCharacters::getNameColumnIndex() const @@ -233,7 +233,7 @@ LLSD LLFloaterPathfindingCharacters::buildCharacterScrollListData(const LLPathfi return element; } -void LLFloaterPathfindingCharacters::updateStateOnActionFields() +void LLFloaterPathfindingCharacters::updateStateOnDisplayControls() { int numSelectedItems = getNumSelectedObjects();; #ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE @@ -249,7 +249,7 @@ void LLFloaterPathfindingCharacters::updateStateOnActionFields() } } -void LLFloaterPathfindingCharacters::updateOnScrollListChange() +void LLFloaterPathfindingCharacters::showSelectedCharacterCapsules() { // Hide any previous capsule hideCapsule(); |