diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-01-11 11:22:24 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-01-11 11:22:24 -0500 |
| commit | 6479e0a59b0ace04dcd1529804af90dcbe2accaa (patch) | |
| tree | 1c45c1ffc5e59616ebc2a9015e099da539c88102 | |
| parent | 003e63268028ffe81fa4c97d5006d58ca382fd42 (diff) | |
| parent | bbe8ed85ae9edbc0b87c9e0d435bba841445d061 (diff) | |
merge
| -rwxr-xr-x | indra/newview/llviewertexture.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 8eada5c2a1..5763fe307e 100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -616,7 +616,7 @@ LLViewerTexture::LLViewerTexture(const LLImageRaw* raw, BOOL usemipmaps) : LLViewerTexture::~LLViewerTexture() { - LL_DEBUGS("Avatar") << mID << llendl; + // LL_DEBUGS("Avatar") << mID << llendl; cleanup(); sImageCount--; } diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 41dfe51116..8f118f5110 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -221,7 +221,7 @@ void LLVOAvatarSelf::initInstance() return; } - doPeriodically(output_self_av_texture_diagnostics, 30.0); + //doPeriodically(output_self_av_texture_diagnostics, 30.0); } // virtual |