Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
indra/llinventory/llinventory.cpp
View File

@@ -212,8 +212,8 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
}
else
{
llwarns << "unknown keyword '" << keyword
<< "' in LLInventoryObject::importLegacyStream() for object " << mUUID << llendl;
LL_WARNS() << "unknown keyword '" << keyword
<< "' in LLInventoryObject::importLegacyStream() for object " << mUUID << LL_ENDL;
}
}
return TRUE;
@@ -253,19 +253,19 @@ BOOL LLInventoryObject::exportLegacyStream(std::ostream& output_stream, BOOL) co
void LLInventoryObject::removeFromServer()
{
// don't do nothin'
llwarns << "LLInventoryObject::removeFromServer() called. Doesn't do anything." << llendl;
LL_WARNS() << "LLInventoryObject::removeFromServer() called. Doesn't do anything." << LL_ENDL;
}
void LLInventoryObject::updateParentOnServer(BOOL) const
{
// don't do nothin'
llwarns << "LLInventoryObject::updateParentOnServer() called. Doesn't do anything." << llendl;
LL_WARNS() << "LLInventoryObject::updateParentOnServer() called. Doesn't do anything." << LL_ENDL;
}
void LLInventoryObject::updateServer(BOOL) const
{
// don't do nothin'
llwarns << "LLInventoryObject::updateServer() called. Doesn't do anything." << llendl;
LL_WARNS() << "LLInventoryObject::updateServer() called. Doesn't do anything." << LL_ENDL;
}
// inline
@@ -397,23 +397,23 @@ U32 LLInventoryItem::getCRC32() const
// *NOTE: We currently do not validate the name or description,
// but if they change in transit, it's no big deal.
U32 crc = mUUID.getCRC32();
//lldebugs << "1 crc: " << std::hex << crc << std::dec << llendl;
//LL_DEBUGS() << "1 crc: " << std::hex << crc << std::dec << LL_ENDL;
crc += mParentUUID.getCRC32();
//lldebugs << "2 crc: " << std::hex << crc << std::dec << llendl;
//LL_DEBUGS() << "2 crc: " << std::hex << crc << std::dec << LL_ENDL;
crc += mPermissions.getCRC32();
//lldebugs << "3 crc: " << std::hex << crc << std::dec << llendl;
//LL_DEBUGS() << "3 crc: " << std::hex << crc << std::dec << LL_ENDL;
crc += mAssetUUID.getCRC32();
//lldebugs << "4 crc: " << std::hex << crc << std::dec << llendl;
//LL_DEBUGS() << "4 crc: " << std::hex << crc << std::dec << LL_ENDL;
crc += mType;
//lldebugs << "5 crc: " << std::hex << crc << std::dec << llendl;
//LL_DEBUGS() << "5 crc: " << std::hex << crc << std::dec << LL_ENDL;
crc += mInventoryType;
//lldebugs << "6 crc: " << std::hex << crc << std::dec << llendl;
//LL_DEBUGS() << "6 crc: " << std::hex << crc << std::dec << LL_ENDL;
crc += mFlags;
//lldebugs << "7 crc: " << std::hex << crc << std::dec << llendl;
//LL_DEBUGS() << "7 crc: " << std::hex << crc << std::dec << LL_ENDL;
crc += mSaleInfo.getCRC32();
//lldebugs << "8 crc: " << std::hex << crc << std::dec << llendl;
//LL_DEBUGS() << "8 crc: " << std::hex << crc << std::dec << LL_ENDL;
crc += (U32)mCreationDate;
//lldebugs << "9 crc: " << std::hex << crc << std::dec << llendl;
//LL_DEBUGS() << "9 crc: " << std::hex << crc << std::dec << LL_ENDL;
return crc;
}
@@ -573,13 +573,13 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
#ifdef CRC_CHECK
if(local_crc == remote_crc)
{
lldebugs << "crc matches" << llendl;
LL_DEBUGS() << "crc matches" << LL_ENDL;
return TRUE;
}
else
{
llwarns << "inventory crc mismatch: local=" << std::hex << local_crc
<< " remote=" << remote_crc << std::dec << llendl;
LL_WARNS() << "inventory crc mismatch: local=" << std::hex << local_crc
<< " remote=" << remote_crc << std::dec << LL_ENDL;
return FALSE;
}
#else
@@ -715,7 +715,7 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
const char *donkey = mDescription.c_str();
if (donkey[0] == '|')
{
llerrs << "Donkey" << llendl;
LL_ERRS() << "Donkey" << LL_ENDL;
}
*/
}
@@ -727,8 +727,8 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
}
else
{
llwarns << "unknown keyword '" << keyword
<< "' in inventory import of item " << mUUID << llendl;
LL_WARNS() << "unknown keyword '" << keyword
<< "' in inventory import of item " << mUUID << LL_ENDL;
}
}
@@ -738,7 +738,7 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
if((LLInventoryType::IT_NONE == mInventoryType)
|| !inventory_and_asset_types_match(mInventoryType, mType))
{
lldebugs << "Resetting inventory type for " << mUUID << llendl;
LL_DEBUGS() << "Resetting inventory type for " << mUUID << LL_ENDL;
mInventoryType = LLInventoryType::defaultForAssetType(mType);
}
@@ -921,7 +921,7 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
const char *donkey = mDescription.c_str();
if (donkey[0] == '|')
{
llerrs << "Donkey" << llendl;
LL_ERRS() << "Donkey" << LL_ENDL;
}
*/
}
@@ -933,8 +933,8 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
}
else
{
llwarns << "unknown keyword '" << keyword
<< "' in inventory import of item " << mUUID << llendl;
LL_WARNS() << "unknown keyword '" << keyword
<< "' in inventory import of item " << mUUID << LL_ENDL;
}
}
@@ -944,7 +944,7 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
if((LLInventoryType::IT_NONE == mInventoryType)
|| !inventory_and_asset_types_match(mInventoryType, mType))
{
lldebugs << "Resetting inventory type for " << mUUID << llendl;
LL_DEBUGS() << "Resetting inventory type for " << mUUID << LL_ENDL;
mInventoryType = LLInventoryType::defaultForAssetType(mType);
}
@@ -1169,7 +1169,7 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd)
// Because WT_UNKNOWN now has locally a special meaning, make sure we don't receive it from the server.
if (wt == WT_UNKNOWN)
{
lldebugs << "Received inventory item with wearable type WT_UNKNOWN from server!" << llendl;
LL_DEBUGS() << "Received inventory item with wearable type WT_UNKNOWN from server!" << LL_ENDL;
// Change this new wearable type to WT_COUNT, as if when we had not inserted WT_UNKNOWN locally.
mFlags += 1;
wt = WT_COUNT;
@@ -1210,7 +1210,7 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd)
if((LLInventoryType::IT_NONE == mInventoryType)
|| !inventory_and_asset_types_match(mInventoryType, mType))
{
lldebugs << "Resetting inventory type for " << mUUID << llendl;
LL_DEBUGS() << "Resetting inventory type for " << mUUID << LL_ENDL;
mInventoryType = LLInventoryType::defaultForAssetType(mType);
}
@@ -1283,7 +1283,7 @@ void LLInventoryItem::unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size)
if (NULL == bin_bucket)
{
llerrs << "unpackBinaryBucket failed. bin_bucket is NULL." << llendl;
LL_ERRS() << "unpackBinaryBucket failed. bin_bucket is NULL." << LL_ENDL;
return;
}
@@ -1293,7 +1293,7 @@ void LLInventoryItem::unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size)
item_buffer[bin_bucket_size] = '\0';
std::string str(&item_buffer[0]);
lldebugs << "item buffer: " << str << llendl;
LL_DEBUGS() << "item buffer: " << str << LL_ENDL;
// Tokenize the string.
typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
@@ -1330,7 +1330,7 @@ void LLInventoryItem::unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size)
perm.init(creator_id, owner_id, last_owner_id, group_id);
perm.initMasks(mask_base, mask_owner, mask_group, mask_every, mask_next);
setPermissions(perm);
//lldebugs << "perm: " << perm << llendl;
//LL_DEBUGS() << "perm: " << perm << LL_ENDL;
LLUUID asset_id((*(iter++)).c_str());
setAssetUUID(asset_id);
@@ -1531,8 +1531,8 @@ BOOL LLInventoryCategory::importFile(LLFILE* fp)
}
else
{
llwarns << "unknown keyword '" << keyword
<< "' in inventory import category " << mUUID << llendl;
LL_WARNS() << "unknown keyword '" << keyword
<< "' in inventory import category " << mUUID << LL_ENDL;
}
}
return TRUE;
@@ -1610,8 +1610,8 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
}
else
{
llwarns << "unknown keyword '" << keyword
<< "' in inventory import category " << mUUID << llendl;
LL_WARNS() << "unknown keyword '" << keyword
<< "' in inventory import category " << mUUID << LL_ENDL;
}
}
return TRUE;
@@ -1642,8 +1642,8 @@ LLSD ll_create_sd_from_inventory_item(LLPointer<LLInventoryItem> item)
if(item.isNull()) return rv;
if (item->getType() == LLAssetType::AT_NONE)
{
llwarns << "ll_create_sd_from_inventory_item() for item with AT_NONE"
<< llendl;
LL_WARNS() << "ll_create_sd_from_inventory_item() for item with AT_NONE"
<< LL_ENDL;
return rv;
}
rv[INV_ITEM_ID_LABEL] = item->getUUID();
@@ -1668,8 +1668,8 @@ LLSD ll_create_sd_from_inventory_category(LLPointer<LLInventoryCategory> cat)
if(cat.isNull()) return rv;
if (cat->getType() == LLAssetType::AT_NONE)
{
llwarns << "ll_create_sd_from_inventory_category() for cat with AT_NONE"
<< llendl;
LL_WARNS() << "ll_create_sd_from_inventory_category() for cat with AT_NONE"
<< LL_ENDL;
return rv;
}
rv[INV_FOLDER_ID_LABEL] = cat->getUUID();