diff options
author | simon <none@none> | 2014-05-07 10:56:41 -0700 |
---|---|---|
committer | simon <none@none> | 2014-05-07 10:56:41 -0700 |
commit | 250db74bf9325acdc1169f6c13d297e7fe44b753 (patch) | |
tree | c6926efeefeb10ec3a36b296aa1ac7bd8521e0e3 /indra/llcharacter/lljoint.h | |
parent | 676bad148a72c235ec79742e3f490ca66b4f40d0 (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
Pull and merge viewer-release as version 3.7.8
Diffstat (limited to 'indra/llcharacter/lljoint.h')
-rwxr-xr-x | indra/llcharacter/lljoint.h | 3 |
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! |