diff options
| author | Richard Linden <none@none> | 2012-09-06 11:47:48 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-09-06 11:47:48 -0700 |
| commit | 371b66a6ef7eb2568e3127c1c59326bce6e26ab8 (patch) | |
| tree | 9154fa799fc37df8cb493f921b41ad79596e903c /indra/llcharacter | |
| parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
| parent | 2cdfb170216c798c637081b0e28ec8921f0b777b (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llmotioncontroller.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index 4f6351709e..829dda9993 100644 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -29,8 +29,6 @@ //----------------------------------------------------------------------------- #include "linden_common.h" -#include "llmemtype.h" - #include "llmotioncontroller.h" #include "llkeyframemotion.h" #include "llmath.h" @@ -335,7 +333,6 @@ void LLMotionController::removeMotionInstance(LLMotion* motionp) //----------------------------------------------------------------------------- LLMotion* LLMotionController::createMotion( const LLUUID &id ) { - LLMemType mt(LLMemType::MTYPE_ANIMATION); // do we have an instance of this motion for this character? LLMotion *motion = findMotion(id); |