diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-03 14:13:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-03 14:13:12 -0400 |
| commit | 299e18e588338d19a40a4b9944e9ddd31216b0c8 (patch) | |
| tree | 985a3fe37b693cf377c953a880c967f5e29b2abc /indra/newview/llviewertexture.cpp | |
| parent | 01ee25cca43b175567859becd1eacf77db24af55 (diff) | |
| parent | 93099e22897c8650927b0dc90a4a38e2a7cf81d8 (diff) | |
Automated merge with file:///Users/oz/Work/V-PR
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) { |