From e156e9ed03fd16af36e2b28823f07658f4d9b0c8 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 16 Feb 2012 14:55:21 -0800
Subject: PATH-292: First pass at implementing the new design of the linksets
 floater.

---
 indra/newview/llfilteredpathfindinglinksets.cpp | 59 ++++++-------------------
 1 file changed, 14 insertions(+), 45 deletions(-)

(limited to 'indra/newview/llfilteredpathfindinglinksets.cpp')

diff --git a/indra/newview/llfilteredpathfindinglinksets.cpp b/indra/newview/llfilteredpathfindinglinksets.cpp
index aaff2bcc68..b76d95737c 100644
--- a/indra/newview/llfilteredpathfindinglinksets.cpp
+++ b/indra/newview/llfilteredpathfindinglinksets.cpp
@@ -116,9 +116,7 @@ LLFilteredPathfindingLinksets::LLFilteredPathfindingLinksets()
 	mIsFiltersDirty(false),
 	mNameFilter(),
 	mDescriptionFilter(),
-	mIsWalkableFilter(true),
-	mIsObstacleFilter(true),
-	mIsIgnoredFilter(true)
+	mLinksetUseFilter(LLPathfindingLinkset::kUnknown)
 {
 }
 
@@ -128,9 +126,7 @@ LLFilteredPathfindingLinksets::LLFilteredPathfindingLinksets(const LLSD& pLinkse
 	mIsFiltersDirty(false),
 	mNameFilter(),
 	mDescriptionFilter(),
-	mIsWalkableFilter(true),
-	mIsObstacleFilter(true),
-	mIsIgnoredFilter(true)
+	mLinksetUseFilter(LLPathfindingLinkset::kUnknown)
 {
 	setPathfindingLinksets(pLinksetItems);
 }
@@ -141,9 +137,7 @@ LLFilteredPathfindingLinksets::LLFilteredPathfindingLinksets(const LLFilteredPat
 	mIsFiltersDirty(pOther.mIsFiltersDirty),
 	mNameFilter(pOther.mNameFilter),
 	mDescriptionFilter(pOther.mDescriptionFilter),
-	mIsWalkableFilter(pOther.mIsWalkableFilter),
-	mIsObstacleFilter(pOther.mIsObstacleFilter),
-	mIsIgnoredFilter(pOther.mIsIgnoredFilter)
+	mLinksetUseFilter(pOther.mLinksetUseFilter)
 {
 }
 
@@ -219,7 +213,8 @@ const LLFilteredPathfindingLinksets::PathfindingLinksetMap& LLFilteredPathfindin
 
 BOOL LLFilteredPathfindingLinksets::isFiltersActive() const
 {
-	return (mNameFilter.isActive() || mDescriptionFilter.isActive() || !mIsWalkableFilter || !mIsObstacleFilter || !mIsIgnoredFilter);
+	return (mNameFilter.isActive() || mDescriptionFilter.isActive() ||
+		(mLinksetUseFilter != LLPathfindingLinkset::kUnknown));
 }
 
 void LLFilteredPathfindingLinksets::setNameFilter(const std::string& pNameFilter)
@@ -242,46 +237,22 @@ const std::string& LLFilteredPathfindingLinksets::getDescriptionFilter() const
 	return mDescriptionFilter.get();
 }
 
-void LLFilteredPathfindingLinksets::setWalkableFilter(BOOL pWalkableFilter)
+void LLFilteredPathfindingLinksets::setLinksetUseFilter(LLPathfindingLinkset::ELinksetUse pLinksetUse)
 {
-	mIsFiltersDirty = (mIsFiltersDirty || (mIsWalkableFilter == pWalkableFilter));
-	mIsWalkableFilter = pWalkableFilter;
+	mIsFiltersDirty = (mIsFiltersDirty || (mLinksetUseFilter == pLinksetUse));
+	mLinksetUseFilter = pLinksetUse;
 }
 
-BOOL LLFilteredPathfindingLinksets::isWalkableFilter() const
+LLPathfindingLinkset::ELinksetUse LLFilteredPathfindingLinksets::getLinksetUseFilter() const
 {
-	return mIsWalkableFilter;
-}
-
-void LLFilteredPathfindingLinksets::setObstacleFilter(BOOL pObstacleFilter)
-{
-	mIsFiltersDirty = (mIsFiltersDirty || (mIsObstacleFilter == pObstacleFilter));
-	mIsObstacleFilter = pObstacleFilter;
-}
-
-BOOL LLFilteredPathfindingLinksets::isObstacleFilter() const
-{
-	return mIsObstacleFilter;
-}
-
-void LLFilteredPathfindingLinksets::setIgnoredFilter(BOOL pIgnoredFilter)
-{
-	mIsFiltersDirty = (mIsFiltersDirty || (mIsIgnoredFilter == pIgnoredFilter));
-	mIsIgnoredFilter = pIgnoredFilter;
-}
-
-BOOL LLFilteredPathfindingLinksets::isIgnoredFilter() const
-{
-	return mIsIgnoredFilter;
+	return mLinksetUseFilter;
 }
 
 void LLFilteredPathfindingLinksets::clearFilters()
 {
 	mNameFilter.clear();
 	mDescriptionFilter.clear();
-	mIsWalkableFilter = true;
-	mIsObstacleFilter = true;
-	mIsIgnoredFilter = true;
+	mLinksetUseFilter = LLPathfindingLinkset::kUnknown;
 	mIsFiltersDirty = false;
 }
 
@@ -305,9 +276,7 @@ void LLFilteredPathfindingLinksets::applyFilters()
 
 BOOL LLFilteredPathfindingLinksets::doesMatchFilters(const LLPathfindingLinkset& pLinkset) const
 {
-	return (((mIsWalkableFilter && (pLinkset.getPathState() == LLPathfindingLinkset::kWalkable)) ||
-			 (mIsObstacleFilter && (pLinkset.getPathState() == LLPathfindingLinkset::kObstacle)) ||
-			 (mIsIgnoredFilter && (pLinkset.getPathState() == LLPathfindingLinkset::kIgnored))) &&
-			(!mNameFilter.isActive() || mNameFilter.doesMatch(pLinkset.getName())) &&
-			(!mDescriptionFilter.isActive() || mDescriptionFilter.doesMatch(pLinkset.getDescription())));
+	return (((mLinksetUseFilter == LLPathfindingLinkset::kUnknown) || (mLinksetUseFilter == pLinkset.getLinksetUse())) &&
+		(!mNameFilter.isActive() || mNameFilter.doesMatch(pLinkset.getName())) &&
+		(!mDescriptionFilter.isActive() || mDescriptionFilter.doesMatch(pLinkset.getDescription())));
 }
-- 
cgit v1.2.3