livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PATH-292: Clearing up an assert case that could happen in practice.

master
Todd Stinson 2012-02-16 17:23:57 -08:00
parent e30b77f818
commit 3960e8f49d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llpathfindinglinkset.cpp
View File

@ -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));