diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-06-28 16:09:11 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-28 16:09:11 -0700 |
commit | fcc810c67d251247c1c4f26dfe1dcde0450d7ad5 (patch) | |
tree | 0cbe22b4b89797c7092ec3535e1c9c881aba52bd | |
parent | c57d00ddfaaa9840122192b6ea2553d77a7c6e99 (diff) |
Ensuring that the linksets filters are cleared before attempting to select an object from right-click in-world menu.
-rw-r--r-- | indra/newview/llfloaterpathfindinglinksets.cpp | 10 | ||||
-rw-r--r-- | indra/newview/llfloaterpathfindinglinksets.h | 1 |
2 files changed, 3 insertions, 8 deletions
diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp index 15490ff87e..d6a08eeb23 100644 --- a/indra/newview/llfloaterpathfindinglinksets.cpp +++ b/indra/newview/llfloaterpathfindinglinksets.cpp @@ -68,6 +68,7 @@ void LLFloaterPathfindingLinksets::openLinksetsWithSelectedObjects() { LLFloaterPathfindingLinksets *linksetsFloater = LLFloaterReg::getTypedInstance<LLFloaterPathfindingLinksets>("pathfinding_linksets"); + linksetsFloater->clearFilters(); linksetsFloater->showFloaterWithSelectionObjects(); } @@ -287,12 +288,13 @@ void LLFloaterPathfindingLinksets::requestSetLinksets(LLPathfindingObjectListPtr void LLFloaterPathfindingLinksets::onApplyAllFilters() { - applyFilters(); + rebuildObjectsScrollList(); } void LLFloaterPathfindingLinksets::onClearFiltersClicked() { clearFilters(); + rebuildObjectsScrollList(); } void LLFloaterPathfindingLinksets::onWalkabilityCoefficientEntered(LLUICtrl *pUICtrl) @@ -322,17 +324,11 @@ void LLFloaterPathfindingLinksets::onApplyChangesClicked() applyEdit(); } -void LLFloaterPathfindingLinksets::applyFilters() -{ - rebuildObjectsScrollList(); -} - void LLFloaterPathfindingLinksets::clearFilters() { mFilterByName->clear(); mFilterByDescription->clear(); setFilterLinksetUse(LLPathfindingLinkset::kUnknown); - rebuildObjectsScrollList(); } void LLFloaterPathfindingLinksets::updateEditFieldValues() diff --git a/indra/newview/llfloaterpathfindinglinksets.h b/indra/newview/llfloaterpathfindinglinksets.h index b3e7acfbfe..a4631ffeb7 100644 --- a/indra/newview/llfloaterpathfindinglinksets.h +++ b/indra/newview/llfloaterpathfindinglinksets.h @@ -75,7 +75,6 @@ private: void onWalkabilityCoefficientEntered(LLUICtrl *pUICtrl); void onApplyChangesClicked(); - void applyFilters(); void clearFilters(); void updateEditFieldValues(); |