diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp index 15490ff87e71c1e1fdbba83d05620738a845bdeb..d6a08eeb23c4237ed026cd73219991cbf08e7aef 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 b3e7acfbfec13ca63fbd4e5c56b9c3d40b05dad6..a4631ffeb7ffaf599cfb9569574e096517a0e491 100644 --- a/indra/newview/llfloaterpathfindinglinksets.h +++ b/indra/newview/llfloaterpathfindinglinksets.h @@ -75,7 +75,6 @@ class LLFloaterPathfindingLinksets : public LLFloaterPathfindingObjects void onWalkabilityCoefficientEntered(LLUICtrl *pUICtrl); void onApplyChangesClicked(); - void applyFilters(); void clearFilters(); void updateEditFieldValues();