diff options
author | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
commit | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (patch) | |
tree | 359719c76abf090fb8cc5ae912ed013b64cb8fc7 /indra/llinventory/llsaleinfo.cpp | |
parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
parent | 5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (diff) |
merge with release
Diffstat (limited to 'indra/llinventory/llsaleinfo.cpp')
-rwxr-xr-x | indra/llinventory/llsaleinfo.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp index dd408a8efe..63e34d188e 100755 --- a/indra/llinventory/llsaleinfo.cpp +++ b/indra/llinventory/llsaleinfo.cpp @@ -179,14 +179,14 @@ BOOL LLSaleInfo::importFile(LLFILE* fp, BOOL& has_perm_mask, U32& perm_mask) } else if (!strcmp("perm_mask", keyword)) { - //llinfos << "found deprecated keyword perm_mask" << llendl; + //LL_INFOS() << "found deprecated keyword perm_mask" << LL_ENDL; has_perm_mask = TRUE; sscanf(valuestr, "%x", &perm_mask); } else { - llwarns << "unknown keyword '" << keyword - << "' in sale info import" << llendl; + LL_WARNS() << "unknown keyword '" << keyword + << "' in sale info import" << LL_ENDL; } } return success; @@ -235,14 +235,14 @@ BOOL LLSaleInfo::importLegacyStream(std::istream& input_stream, BOOL& has_perm_m } else if (!strcmp("perm_mask", keyword)) { - //llinfos << "found deprecated keyword perm_mask" << llendl; + //LL_INFOS() << "found deprecated keyword perm_mask" << LL_ENDL; has_perm_mask = TRUE; sscanf(valuestr, "%x", &perm_mask); } else { - llwarns << "unknown keyword '" << keyword - << "' in sale info import" << llendl; + LL_WARNS() << "unknown keyword '" << keyword + << "' in sale info import" << LL_ENDL; } } return success; |