diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-24 15:10:13 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-24 15:10:13 -0500 |
| commit | 0f86c26fa5c7c774e43189dd5ef5d68cb81e6dbf (patch) | |
| tree | 67f26cd98a492f0aff9d4ccb9a276221fdbc5e3a /indra/newview/llviewertexture.cpp | |
| parent | 6df418b7af8b8088f72089dc11401db455c26e13 (diff) | |
| parent | 26a9a6929c23eabfef0a53355a392fef0ad26b83 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 4da0f80a00..5fcc57bc91 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -599,7 +599,7 @@ bool LLViewerTexture::bindDefaultImage(S32 stage) } if (!res && LLViewerTexture::sNullImagep.notNull() && (this != LLViewerTexture::sNullImagep)) { - res = gGL.getTexUnit(stage)->bind(LLViewerTexture::sNullImagep) ; + res = gGL.getTexUnit(stage)->bind(LLViewerTexture::sNullImagep); } if (!res) { |