summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.h
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-09-03 15:30:16 +0100
committerAimee Linden <aimee@lindenlab.com>2010-09-03 15:30:16 +0100
commit0a74d1593513dc3209fdb29a8dc56b2794b36a29 (patch)
tree1af644fe9ad3c62999c177ae37cbeff2ffe19d62 /indra/newview/llviewerobject.h
parentce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff)
parent54b9992eaefe2b68d16a6264c1901f12612e99dc (diff)
Merge between james/viewer-identity-evolution and dessie/viewer-public
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rw-r--r--indra/newview/llviewerobject.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 33fda9fa2d..08365d0cc2 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -37,7 +37,6 @@
#include "llassetstorage.h"
#include "lldarrayptr.h"
-#include "llhudtext.h"
#include "llhudicon.h"
#include "llinventory.h"
#include "llrefcount.h"
@@ -60,6 +59,7 @@ class LLColor4;
class LLFrameTimer;
class LLDrawable;
class LLHost;
+class LLHUDText;
class LLWorld;
class LLNameValue;
class LLNetMap;