diff options
| author | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
| commit | b8d49dab9afddf196618d66b1a409cdf7d2d53ba (patch) | |
| tree | 535eb32ba4f17c87c0853cda9223c37a4940fea1 /indra/llprimitive/llmaterialtable.cpp | |
| parent | c2601ec9c574ac3bd7a7f4001bc08572483028a6 (diff) | |
| parent | 1a093beb7f69e6911f34cb12d71502aa7a05982e (diff) | |
merge
Diffstat (limited to 'indra/llprimitive/llmaterialtable.cpp')
| -rwxr-xr-x | indra/llprimitive/llmaterialtable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp index 4709e769c1..37c718b4c6 100755 --- a/indra/llprimitive/llmaterialtable.cpp +++ b/indra/llprimitive/llmaterialtable.cpp @@ -547,14 +547,14 @@ LLUUID LLMaterialTable::getCollisionSoundUUID(U8 mcode, U8 mcode2) mcode &= LL_MCODE_MASK; mcode2 &= LL_MCODE_MASK; - //llinfos << "code 1: " << ((U32) mcode) << " code 2:" << ((U32) mcode2) << llendl; + //LL_INFOS() << "code 1: " << ((U32) mcode) << " code 2:" << ((U32) mcode2) << LL_ENDL; if (mCollisionSoundMatrix && (mcode < LL_MCODE_END) && (mcode2 < LL_MCODE_END)) { return(mCollisionSoundMatrix[mcode * LL_MCODE_END + mcode2]); } else { - //llinfos << "Null Sound" << llendl; + //LL_INFOS() << "Null Sound" << LL_ENDL; return(SND_NULL); } } |