diff options
author | James Cook <james@lindenlab.com> | 2010-03-08 10:54:23 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-03-08 10:54:23 -0800 |
commit | 18ebacefcfb5909a58a213a97c6a687afe9b877e (patch) | |
tree | 5b48ebad64a253bd9aa50371c2308389cbec64bf /indra/newview/llviewerjointattachment.cpp | |
parent | 34d1d34ca100fd137c2a85f0e0f330730fb70aba (diff) | |
parent | 42606dbbb5f452211e4fc30ee0ed41334fc14e8d (diff) |
Merge with viewer 2 beta 4
Diffstat (limited to 'indra/newview/llviewerjointattachment.cpp')
-rw-r--r-- | indra/newview/llviewerjointattachment.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp index 2b4b78d82d..b230203561 100644 --- a/indra/newview/llviewerjointattachment.cpp +++ b/indra/newview/llviewerjointattachment.cpp @@ -39,6 +39,7 @@ #include "llviewercontrol.h" #include "lldrawable.h" #include "llgl.h" +#include "llhudtext.h" #include "llrender.h" #include "llvoavatar.h" #include "llvolume.h" |