diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
| commit | 4942a7b77917f9a163453ecdd040993965672cc0 (patch) | |
| tree | 3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/llcharacter | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llanimationstates.cpp | 2 | ||||
| -rw-r--r-- | indra/llcharacter/llbvhloader.cpp | 8 | ||||
| -rw-r--r-- | indra/llcharacter/llbvhloader.h | 5 | ||||
| -rw-r--r-- | indra/llcharacter/lljointsolverrp3.cpp | 2 |
4 files changed, 3 insertions, 14 deletions
diff --git a/indra/llcharacter/llanimationstates.cpp b/indra/llcharacter/llanimationstates.cpp index 58ba252e04..9e21e934c4 100644 --- a/indra/llcharacter/llanimationstates.cpp +++ b/indra/llcharacter/llanimationstates.cpp @@ -12,8 +12,6 @@ #include "linden_common.h" -#include <string.h> - #include "llanimationstates.h" #include "llstring.h" diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp index 3be8e121c6..b1eb05f117 100644 --- a/indra/llcharacter/llbvhloader.cpp +++ b/indra/llcharacter/llbvhloader.cpp @@ -9,6 +9,9 @@ #include "linden_common.h" #include "llbvhloader.h" + +#include <boost/tokenizer.hpp> + #include "lldatapacker.h" #include "lldir.h" #include "llkeyframemotion.h" @@ -16,11 +19,6 @@ #include "llstl.h" #include "llapr.h" -#include <stdio.h> -#include <string.h> -#include <stdarg.h> -#include <llquaternion.h> -#include <boost/tokenizer.hpp> using namespace std; diff --git a/indra/llcharacter/llbvhloader.h b/indra/llcharacter/llbvhloader.h index 7e00e1d5f4..8f6de27be1 100644 --- a/indra/llcharacter/llbvhloader.h +++ b/indra/llcharacter/llbvhloader.h @@ -9,11 +9,6 @@ #ifndef LL_LLBVHLOADER_H #define LL_LLBVHLOADER_H -#include <string> -#include <vector> -#include <map> -#include <stdtypes.h> -#include <stdio.h> #include "v3math.h" #include "m3math.h" #include "llmath.h" diff --git a/indra/llcharacter/lljointsolverrp3.cpp b/indra/llcharacter/lljointsolverrp3.cpp index 60b836734a..351b767622 100644 --- a/indra/llcharacter/lljointsolverrp3.cpp +++ b/indra/llcharacter/lljointsolverrp3.cpp @@ -13,8 +13,6 @@ #include "lljointsolverrp3.h" -#include <math.h> - #include "llmath.h" #define F_EPSILON 0.00001f |