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/llpathfindingcharacter.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/llpathfindingcharacter.cpp')
| -rw-r--r-- | indra/newview/llpathfindingcharacter.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 0696783bf7..c7843b8fee 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -31,12 +31,16 @@ #include "llpathfindingobject.h" #include "llsd.h" +#include "llpathinglib.h" #define CHARACTER_CPU_TIME_FIELD "cpu_time" #define CHARACTER_HORIZONTAL_FIELD "horizontal" #define CHARACTER_LENGTH_FIELD "length" #define CHARACTER_RADIUS_FIELD "radius" +//prep# +#define SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE + //--------------------------------------------------------------------------- // LLPathfindingCharacter //--------------------------------------------------------------------------- @@ -119,5 +123,11 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD)); llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal()); mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal(); + + //Create the rep inside the pathing library + LLVector3 empty(0,0,0); + const LLUUID id = getUUID(); + LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, id ); + #endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE } |