diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-22 13:10:59 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-22 13:10:59 -0700 |
commit | b8ce05ed08a7db0825c04c217888814ef523027a (patch) | |
tree | cae04332048f649e1280d3bdc3d20f46df773e67 /indra/newview/lllocaltextureobject.cpp | |
parent | e5484e56b3c13e65bd31d7bf21c1cd3a2d9333f2 (diff) | |
parent | a464d469705aeae57fcdbfafa45e2bf592a182c5 (diff) |
merge
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); |