diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-26 09:59:39 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-26 09:59:39 -0700 |
commit | d6e8f32b8073d85db59f2a45a10d622b71c859ae (patch) | |
tree | 953c5efd60338604c229824467270cd8d5a458ce /indra/newview/lllocaltextureobject.h | |
parent | add9298c1e4d74bdb5503722a6c795ea6f30fa11 (diff) | |
parent | 53c972a521cbb92c6c9390c41b250a41dc22cd5a (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(); |