summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-08-11 17:11:57 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-08-11 17:11:57 -0400
commitdc6c486dea4ad16c3ed3130549ef8d04bc0c251b (patch)
tree793505e141c1352a0b1a7dc2e8ff73407658bdaf /indra/newview/llviewertexture.cpp
parent25d23fcbeb784e1f1312195d9ea31ad59ee81dc4 (diff)
parent8c5da0552db39ba6031b76ffb08994e53217a559 (diff)
reconciled .hgtags
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r--indra/newview/llviewertexture.cpp2
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)
{