summaryrefslogtreecommitdiff
path: root/indra/llcharacter/lljoint.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-03-24 19:23:34 -0700
committerRichard Linden <none@none>2014-03-24 19:23:34 -0700
commite5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (patch)
tree359719c76abf090fb8cc5ae912ed013b64cb8fc7 /indra/llcharacter/lljoint.h
parent31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff)
parent5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (diff)
merge with release
Diffstat (limited to 'indra/llcharacter/lljoint.h')
-rwxr-xr-xindra/llcharacter/lljoint.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index 2b1e2005c6..6efa13aeb5 100755
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -31,14 +31,13 @@
// Header Files
//-----------------------------------------------------------------------------
#include <string>
+#include <list>
-#include "linked_lists.h"
#include "v3math.h"
#include "v4math.h"
#include "m4math.h"
#include "llquaternion.h"
#include "xform.h"
-#include "lldarray.h"
const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15;
const U32 LL_CHARACTER_MAX_JOINTS = 32; // must be divisible by 4!