summaryrefslogtreecommitdiff
path: root/indra/newview/lllocaltextureobject.h
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-23 12:15:22 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-23 12:15:22 -0700
commit127b428863707c882fbf4d30699321b8a2365644 (patch)
tree728c98bd177635891f0646ccabcf86b70341d4a0 /indra/newview/lllocaltextureobject.h
parent0220106ecdecd323854522a5bc3fd6455c60fdfc (diff)
parent2438a9168b117dcabf5e5819f93e08a874735a26 (diff)
merge
Diffstat (limited to 'indra/newview/lllocaltextureobject.h')
-rw-r--r--indra/newview/lllocaltextureobject.h5
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();