diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
commit | 2268bf38339178f93b317693c0a6808807301d64 (patch) | |
tree | 0a17c21975babce8422b9b62a1683947f5a58f2c /indra/newview/lldynamictexture.cpp | |
parent | d233d8836b610b5e5ca76a1e3bb4d63dc3592e66 (diff) | |
parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) |
merge changes for 3.5.3-release
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/newview/lldynamictexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index fa42b157a7..29ad4f34d2 100644..100755 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -107,7 +107,7 @@ void LLViewerDynamicTexture::generateGLTexture(LLGLint internal_format, LLGLenum { setExplicitFormat(internal_format, primary_format, type_format, swap_bytes); } - createGLTexture(0, raw_image, 0, TRUE, LLViewerTexture::DYNAMIC_TEX); + createGLTexture(0, raw_image, 0, TRUE, LLGLTexture::DYNAMIC_TEX); setAddressMode((mClamp) ? LLTexUnit::TAM_CLAMP : LLTexUnit::TAM_WRAP); mGLTexturep->setGLTextureCreated(false); } |