diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-05 19:09:28 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-05 19:09:28 -0400 |
commit | 8c5da0552db39ba6031b76ffb08994e53217a559 (patch) | |
tree | f4ac194d15a0a58475496543bbb36d587d195b4f /indra/newview/llviewertexture.cpp | |
parent | fce8bda3b6e502b3de9b6a34279255999478e407 (diff) | |
parent | 8675901fa85de600cc1ef7c5263a5906fd2b2811 (diff) |
merged .hgtags
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) { |