diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-05-31 18:07:11 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-05-31 18:07:11 -0700 |
commit | fc1dd5583361d7dfa2592bf746cbb65308303d8d (patch) | |
tree | a5454c5651b1e88604c60f220bb9f146f3a7db40 /indra/newview/llpathfindingcharacterlist.cpp | |
parent | 41bcd567646190cda86ec3ee77041bd84193c377 (diff) | |
parent | f17646cc29e771fb626266dd66c5114aff49e701 (diff) |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/llpathfindingcharacterlist.cpp')
-rw-r--r-- | indra/newview/llpathfindingcharacterlist.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpathfindingcharacterlist.cpp b/indra/newview/llpathfindingcharacterlist.cpp index 9b0ed14e35..15eaac771f 100644 --- a/indra/newview/llpathfindingcharacterlist.cpp +++ b/indra/newview/llpathfindingcharacterlist.cpp @@ -33,6 +33,7 @@ #include "llpathfindingobject.h" #include "llpathfindingobjectlist.h" #include "llsd.h" +#include "llpathinglib.h" //--------------------------------------------------------------------------- // LLPathfindingCharacterList @@ -46,6 +47,13 @@ LLPathfindingCharacterList::LLPathfindingCharacterList() LLPathfindingCharacterList::LLPathfindingCharacterList(const LLSD& pCharacterListData) : LLPathfindingObjectList() { + if ( LLPathingLib::getInstance() == NULL ) + { + LLPathingLib::initSystem(); + } + + LLPathingLib::getInstance()->cleanupPhysicsCapsuleRepResiduals( ); + parseCharacterListData(pCharacterListData); } |