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.cpp | |
| 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.cpp')
| -rw-r--r-- | indra/newview/lllocaltextureobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |