diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-10-22 12:22:06 +0100 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-10-22 12:22:06 +0100 |
| commit | 4c4da8aca2944c2992d4ae0e13e72b9c6c0aa84f (patch) | |
| tree | d069583717bf5442784a5215491ec97694ee94fb /indra/newview/lllocaltextureobject.h | |
| parent | 1478be6b734d413c81e9923c5ac30019d9f8a571 (diff) | |
Fix the Mac and Linux build after llwearable breakage. Needed to add
an explicit include for LLViewerFetchedTexture because it's used for
a template specialization, and fixed LLLocalTextureObject constructor
to take a const LLUUID reference so locals can be passed.
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(); |