diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-22 13:10:59 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-22 13:10:59 -0700 |
commit | b8ce05ed08a7db0825c04c217888814ef523027a (patch) | |
tree | cae04332048f649e1280d3bdc3d20f46df773e67 /indra/newview/lllocaltextureobject.h | |
parent | e5484e56b3c13e65bd31d7bf21c1cd3a2d9333f2 (diff) | |
parent | a464d469705aeae57fcdbfafa45e2bf592a182c5 (diff) |
merge
Diffstat (limited to 'indra/newview/lllocaltextureobject.h')
-rw-r--r-- | indra/newview/lllocaltextureobject.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lllocaltextureobject.h b/indra/newview/lllocaltextureobject.h index 461756ee46..c8b8aa924b 100644 --- a/indra/newview/lllocaltextureobject.h +++ b/indra/newview/lllocaltextureobject.h @@ -35,7 +35,8 @@ #include <boost/shared_ptr.hpp> -class LLViewerFetchedTexture; +#include "llviewertexture.h" + class LLUUID; class LLTexLayer; class LLTextureEntry; @@ -49,7 +50,7 @@ class LLLocalTextureObject { public: LLLocalTextureObject(); - LLLocalTextureObject(LLViewerFetchedTexture* image, LLUUID& id); + LLLocalTextureObject(LLViewerFetchedTexture* image, const LLUUID& id); LLLocalTextureObject(const LLLocalTextureObject& lto); ~LLLocalTextureObject(); |