From a4000c3744e42fcbb638e742f3b63fa31a0dee15 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 8 May 2009 07:43:08 +0000 Subject: merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7 --- indra/newview/lltracker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lltracker.h') diff --git a/indra/newview/lltracker.h b/indra/newview/lltracker.h index 2850365272..bfe9d6c6b5 100644 --- a/indra/newview/lltracker.h +++ b/indra/newview/lltracker.h @@ -40,7 +40,7 @@ #define LL_LLTRACKER_H #include "lldarray.h" -#include "llmemory.h" +#include "llpointer.h" #include "llstring.h" #include "lluuid.h" #include "v3dmath.h" -- cgit v1.2.3