summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-08-16 13:49:35 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-08-16 13:49:35 -0400
commit8379df21bce877897aec6c56f170b6e2ad11c7be (patch)
tree908e3940d8c9624b1b0591567a35b2314ed6277c /indra/newview/llviewertexture.cpp
parent6c61a537918b5cc73336885f8bdd34943fda2482 (diff)
parentf99cf295e1d7e297996d4ea32a2202273010d8a3 (diff)
merged .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)
{