From 4c4da8aca2944c2992d4ae0e13e72b9c6c0aa84f Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Thu, 22 Oct 2009 12:22:06 +0100 Subject: 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. --- indra/newview/lllocaltextureobject.cpp | 2 +- indra/newview/lllocaltextureobject.h | 5 +++-- indra/newview/llwearable.cpp | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/lllocaltextureobject.cpp b/indra/newview/lllocaltextureobject.cpp index 0bd3e42556..6bcbe6f58c 100644 --- a/indra/newview/lllocaltextureobject.cpp +++ b/indra/newview/lllocaltextureobject.cpp @@ -47,7 +47,7 @@ LLLocalTextureObject::LLLocalTextureObject() : mImage = NULL; } -LLLocalTextureObject::LLLocalTextureObject(LLViewerFetchedTexture* image, LLUUID& id) +LLLocalTextureObject::LLLocalTextureObject(LLViewerFetchedTexture* image, const LLUUID& id) { mImage = image; gGL.getTexUnit(0)->bind(mImage); 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 -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(); diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index 84bb099d55..d1ad89442c 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -35,6 +35,7 @@ #include "llagent.h" #include "llagentwearables.h" #include "llfloatercustomize.h" +#include "lllocaltextureobject.h" #include "llviewertexturelist.h" #include "llinventorymodel.h" #include "llviewerregion.h" -- cgit v1.2.3