diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2012-06-15 00:28:12 +0000 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2012-06-15 00:28:12 +0000 |
| commit | e76fe073df81d4fd2b25d09f7c0ccd0566c2e966 (patch) | |
| tree | b9270197dc7b0c6bc06f0ea44c991d5cbf9be865 /indra/newview/llpathfindingcharacterlist.cpp | |
| parent | 8b2ad982d72ade6db7ae45758171fa7b5e30a42a (diff) | |
| parent | f6153ab73508ad972827950e0276dfd2a8e79bf1 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpathfindingcharacterlist.cpp')
| -rw-r--r-- | indra/newview/llpathfindingcharacterlist.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llpathfindingcharacterlist.cpp b/indra/newview/llpathfindingcharacterlist.cpp index 15eaac771f..ac1fb15be9 100644 --- a/indra/newview/llpathfindingcharacterlist.cpp +++ b/indra/newview/llpathfindingcharacterlist.cpp @@ -47,12 +47,10 @@ LLPathfindingCharacterList::LLPathfindingCharacterList() LLPathfindingCharacterList::LLPathfindingCharacterList(const LLSD& pCharacterListData) : LLPathfindingObjectList() { - if ( LLPathingLib::getInstance() == NULL ) + if (LLPathingLib::getInstance() != NULL) { - LLPathingLib::initSystem(); + LLPathingLib::getInstance()->cleanupPhysicsCapsuleRepResiduals( ); } - - LLPathingLib::getInstance()->cleanupPhysicsCapsuleRepResiduals( ); parseCharacterListData(pCharacterListData); } |