diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-25 11:56:49 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-25 11:56:49 -0400 |
commit | 6a15da0133aac12f3223d91078d133d50e7d44ee (patch) | |
tree | fadafea4c31ed6c56560cd2126214486a231ab6d /indra/newview/llviewertexture.cpp | |
parent | 0e3cea49aaba7fb9e4a75c4a76779ba9273549bf (diff) | |
parent | 723d05e6df1d89b8957aca429b1328834f323150 (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) { |