From 3960e8f49d19bc929f6986504856c06df78160dd Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 16 Feb 2012 17:23:57 -0800
Subject: PATH-292: Clearing up an assert case that could happen in practice.

---
 indra/newview/llpathfindinglinkset.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/indra/newview/llpathfindinglinkset.cpp b/indra/newview/llpathfindinglinkset.cpp
index 641f1de16b..de17edbf61 100644
--- a/indra/newview/llpathfindinglinkset.cpp
+++ b/indra/newview/llpathfindinglinkset.cpp
@@ -176,9 +176,8 @@ LLSD LLPathfindingLinkset::encodeAlteredFields(ELinksetUse pLinksetUse, S32 pA,
 {
 	LLSD itemData;
 
-	if (mLinksetUse != pLinksetUse)
+	if ((pLinksetUse != kUnknown) && (mLinksetUse != pLinksetUse))
 	{
-		llassert(pLinksetUse != kUnknown);
 		itemData[LINKSET_PHANTOM_FIELD] = static_cast<bool>(LLPathfindingLinkset::isPhantom(pLinksetUse));
 		itemData[LINKSET_PERMANENT_FIELD] = static_cast<bool>(LLPathfindingLinkset::isPermanent(pLinksetUse));
 		itemData[LINKSET_WALKABLE_FIELD] = static_cast<bool>(LLPathfindingLinkset::isWalkable(pLinksetUse));
-- 
cgit v1.2.3