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

52
indra/newview/llviewerinventory.cpp
View File

@@ -251,8 +251,8 @@ LLViewerInventoryItem::LLViewerInventoryItem(const LLViewerInventoryItem* other)
// <edit>
//if (!mIsComplete)
//{
// llwarns << "LLViewerInventoryItem copy constructor for incomplete item"
// << mUUID << llendl;
// LL_WARNS() << "LLViewerInventoryItem copy constructor for incomplete item"
// << mUUID << LL_ENDL;
//}
}
@@ -295,8 +295,8 @@ void LLViewerInventoryItem::cloneViewerItem(LLPointer<LLViewerInventoryItem>& ne
void LLViewerInventoryItem::removeFromServer()
{
lldebugs << "Removing inventory item " << mUUID << " from server."
<< llendl;
LL_DEBUGS() << "Removing inventory item " << mUUID << " from server."
<< LL_ENDL;
LLInventoryModel::LLCategoryUpdate up(mParentUUID, -1);
gInventory.accountForUpdate(up);
@@ -315,23 +315,23 @@ void LLViewerInventoryItem::updateServer(BOOL is_new) const
{
if(getWearableType() == LLWearableType::WT_UNKNOWN)
{
llwarns << "LLViewerInventoryItem::updateServer() - for item with unknown wearable type"
<< llendl;
LL_WARNS() << "LLViewerInventoryItem::updateServer() - for item with unknown wearable type"
<< LL_ENDL;
return;
}
if(!mIsComplete)
{
// *FIX: deal with this better.
llwarns << "LLViewerInventoryItem::updateServer() - for incomplete item"
<< llendl;
LL_WARNS() << "LLViewerInventoryItem::updateServer() - for incomplete item"
<< LL_ENDL;
LLNotificationsUtil::add("IncompleteInventoryItem");
return;
}
if(gAgent.getID() != mPermissions.getOwner())
{
// *FIX: deal with this better.
llwarns << "LLViewerInventoryItem::updateServer() - for unowned item"
<< llendl;
LL_WARNS() << "LLViewerInventoryItem::updateServer() - for unowned item"
<< LL_ENDL;
return;
}
LLInventoryModel::LLCategoryUpdate up(mParentUUID, is_new ? 1 : 0);
@@ -372,7 +372,7 @@ void LLViewerInventoryItem::fetchFromServer(void) const
}
else
{
llwarns << "Agent Region is absent" << llendl;
LL_WARNS() << "Agent Region is absent" << LL_ENDL;
}
}
@@ -401,7 +401,7 @@ void LLViewerInventoryItem::fetchFromServer(void) const
else
{
// *FIX: this can be removed after a bit.
llwarns << "request to fetch complete item" << llendl;
LL_WARNS() << "request to fetch complete item" << LL_ENDL;
}
}
@@ -601,8 +601,8 @@ void LLViewerInventoryCategory::updateServer(BOOL is_new) const
void LLViewerInventoryCategory::removeFromServer( void )
{
llinfos << "Removing inventory category " << mUUID << " from server."
<< llendl;
LL_INFOS() << "Removing inventory category " << mUUID << " from server."
<< LL_ENDL;
// communicate that change with the server.
#ifndef DELETE_SYSTEM_FOLDERS
if(LLFolderType::lookupIsProtectedType(mPreferredType))
@@ -655,7 +655,7 @@ bool LLViewerInventoryCategory::fetch()
}
else
{
llwarns << "agent region is null" << llendl;
LL_WARNS() << "agent region is null" << LL_ENDL;
}
if (!url.empty() && use_http_inventory()) //Capability found and HTTP inventory enabled. Build up LLSD and use it.
{
@@ -665,7 +665,7 @@ bool LLViewerInventoryCategory::fetch()
{ //We don't have a capability or the use of HTTP inventory is disabled, use the old system.
if (use_http_inventory())
{
llinfos << "FetchInventoryDescendents2 capability not found. Using UDP message." << llendl;
LL_INFOS() << "FetchInventoryDescendents2 capability not found. Using UDP message." << LL_ENDL;
}
LLMessageSystem* msg = gMessageSystem;
msg->newMessage("FetchInventoryDescendents");
@@ -748,8 +748,8 @@ bool LLViewerInventoryCategory::importFileLocal(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;
@@ -862,7 +862,7 @@ LLInventoryCallbackManager::LLInventoryCallbackManager() :
{
if( sInstance != NULL )
{
llwarns << "LLInventoryCallbackManager::LLInventoryCallbackManager: unexpected multiple instances" << llendl;
LL_WARNS() << "LLInventoryCallbackManager::LLInventoryCallbackManager: unexpected multiple instances" << LL_ENDL;
return;
}
sInstance = this;
@@ -872,7 +872,7 @@ LLInventoryCallbackManager::~LLInventoryCallbackManager()
{
if( sInstance != this )
{
llwarns << "LLInventoryCallbackManager::~LLInventoryCallbackManager: unexpected multiple instances" << llendl;
LL_WARNS() << "LLInventoryCallbackManager::~LLInventoryCallbackManager: unexpected multiple instances" << LL_ENDL;
return;
}
sInstance = NULL;
@@ -1120,12 +1120,12 @@ void link_inventory_item(
const LLInventoryObject *baseobj = gInventory.getObject(item_id);
if (!baseobj)
{
llwarns << "attempt to link to unknown item, linked-to-item's itemID " << item_id << llendl;
LL_WARNS() << "attempt to link to unknown item, linked-to-item's itemID " << item_id << LL_ENDL;
return;
}
if (baseobj && baseobj->getIsLinkType())
{
llwarns << "attempt to create a link to a link, linked-to-item's itemID " << item_id << llendl;
LL_WARNS() << "attempt to create a link to a link, linked-to-item's itemID " << item_id << LL_ENDL;
return;
}
@@ -1134,7 +1134,7 @@ void link_inventory_item(
// Fail if item can be found but is of a type that can't be linked.
// Arguably should fail if the item can't be found too, but that could
// be a larger behavioral change.
llwarns << "attempt to link an unlinkable item, type = " << baseobj->getActualType() << llendl;
LL_WARNS() << "attempt to link an unlinkable item, type = " << baseobj->getActualType() << LL_ENDL;
return;
}
@@ -1386,7 +1386,7 @@ const std::string NEW_GESTURE_NAME = "New Gesture"; // *TODO:Translate? (probabl
}
else
{
llwarns << "Can't create unrecognized type " << type_name << llendl;
LL_WARNS() << "Can't create unrecognized type " << type_name << LL_ENDL;
}
}
root->setNeedsAutoRename(TRUE);
@@ -1864,7 +1864,7 @@ void LLViewerInventoryItem::setWearableType(LLWearableType::EType type)
{
if (getWearableType() != LLWearableType::WT_UNKNOWN)
{
llwarns << "Calling LLViewerInventoryItem::setWearableType for item that does not have an unknown wearable type!?" << llendl;
LL_WARNS() << "Calling LLViewerInventoryItem::setWearableType for item that does not have an unknown wearable type!?" << LL_ENDL;
return;
}
mFlags = (mFlags & ~LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK) | type;
@@ -1898,7 +1898,7 @@ LLViewerInventoryItem *LLViewerInventoryItem::getLinkedItem() const
LLViewerInventoryItem *linked_item = gInventory.getItem(mAssetUUID);
if (linked_item && linked_item->getIsLinkType())
{
llwarns << "Warning: Accessing link to link" << llendl;
LL_WARNS() << "Warning: Accessing link to link" << LL_ENDL;
return NULL;
}
return linked_item;