diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 10:55:59 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 10:55:59 -0800 |
commit | b877665551343dc94ca02c84622b06518f9c23d8 (patch) | |
tree | 9ad6a76d0363b56ccb249f105d6ee72207df8864 /indra/newview/lllocaltextureobject.h | |
parent | f732ee6d2e24cd42a06b9cf51c8f6c577f2e476e (diff) | |
parent | 6e018f7143537af7bd9a08f1cc5c87ea4c8382c8 (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(); |