summaryrefslogtreecommitdiff
path: root/indra/newview/lltextureatlas.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-04-07 19:09:40 -0700
committerRichard Linden <none@none>2014-04-07 19:09:40 -0700
commit98aabdc176c23de9ba23f902dc2015f9c775d26e (patch)
tree5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/newview/lltextureatlas.cpp
parent7e966f28da79d2d24f93a2615c8807421300700c (diff)
parente5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (diff)
merge with release
Diffstat (limited to 'indra/newview/lltextureatlas.cpp')
-rwxr-xr-xindra/newview/lltextureatlas.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltextureatlas.cpp b/indra/newview/lltextureatlas.cpp
index dbbe331954..1c8e4f796e 100755
--- a/indra/newview/lltextureatlas.cpp
+++ b/indra/newview/lltextureatlas.cpp
@@ -63,7 +63,7 @@ LLTextureAtlas::~LLTextureAtlas()
{
if(mSpatialGroupList.size() > 0)
{
- llerrs << "Not clean up the spatial groups!" << llendl ;
+ LL_ERRS() << "Not clean up the spatial groups!" << LL_ENDL ;
}
releaseUsageBits() ;
}
@@ -105,7 +105,7 @@ LLGLuint LLTextureAtlas::insertSubTexture(LLImageGL* source_gl_tex, S32 discard_
BOOL res = gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, getTexName());
if (!res)
{
- llerrs << "bindTexture failed" << llendl;
+ LL_ERRS() << "bindTexture failed" << LL_ENDL;
}
GLint xoffset = sSlotSize * slot_col ;
@@ -342,7 +342,7 @@ BOOL LLTextureAtlas::areUsageBitsMarked(S8 bits_len, U8 mask, S16 col, S16 row)
if(ret != ret2)
{
- llerrs << "bits map corrupted." << llendl ;
+ LL_ERRS() << "bits map corrupted." << LL_ENDL ;
}
#endif
return ret ;//FALSE ;