diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-02-16 17:23:57 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-02-16 17:23:57 -0800 |
| commit | 3960e8f49d19bc929f6986504856c06df78160dd (patch) | |
| tree | 8d7e13321c5510059b706c6a7f48b242b5f65356 | |
| parent | e30b77f8185ea7c5e5dcd3b7fd9d07c305ff2c9c (diff) | |
PATH-292: Clearing up an assert case that could happen in practice.
| -rw-r--r-- | indra/newview/llpathfindinglinkset.cpp | 3 |
1 files changed, 1 insertions, 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));
|