diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llflexibleobject.h | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llflexibleobject.h')
| -rw-r--r-- | indra/newview/llflexibleobject.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llflexibleobject.h b/indra/newview/llflexibleobject.h index 895701da3a..811ae24df2 100644 --- a/indra/newview/llflexibleobject.h +++ b/indra/newview/llflexibleobject.h @@ -43,7 +43,6 @@ #ifndef LL_LLFLEXIBLEOBJECT_H #define LL_LLFLEXIBLEOBJECT_H -#include "llmemory.h" #include "llprimitive.h" #include "llvovolume.h" #include "llwind.h" |