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

48
indra/newview/llagentwearablesfetch.cpp
View File

@@ -45,7 +45,7 @@ void order_my_outfits_cb()
{
if (!LLApp::isRunning())
{
llwarns << "called during shutdown, skipping" << llendl;
LL_WARNS() << "called during shutdown, skipping" << LL_ENDL;
return;
}
@@ -60,11 +60,11 @@ void order_my_outfits_cb()
//My Outfits should at least contain saved initial outfit and one another outfit
if (cats->size() < 2)
{
llwarning("My Outfits category was not populated properly", 0);
LL_WARNS() << "My Outfits category was not populated properly" << LL_ENDL;
return;
}
llinfos << "Starting updating My Outfits with wearables ordering information" << llendl;
LL_INFOS() << "Starting updating My Outfits with wearables ordering information" << LL_ENDL;
for (LLInventoryModel::cat_array_t::iterator outfit_iter = cats->begin();
outfit_iter != cats->end(); ++outfit_iter)
@@ -78,7 +78,7 @@ void order_my_outfits_cb()
LLAppearanceMgr::getInstance()->updateClothingOrderingInfo(cat_id);
}
llinfos << "Finished updating My Outfits with wearables ordering information" << llendl;
LL_INFOS() << "Finished updating My Outfits with wearables ordering information" << LL_ENDL;
}
LLInitialWearablesFetch::LLInitialWearablesFetch(const LLUUID& cof_id) :
@@ -140,7 +140,7 @@ void LLInitialWearablesFetch::processContents()
if (mComplete.empty())
{
// We can't call mComplete.front() in this case.
llwarns << "mComplete is empty." << llendl;
LL_WARNS() << "mComplete is empty." << LL_ENDL;
}
else
// </singu temporary fix>
@@ -163,7 +163,7 @@ void LLInitialWearablesFetch::processContents()
const LLUUID& idItem = itWearableData->mItemID; bool fFound = false;
for (S32 idxItem = 0, cntItem = items_by_type[itWearableData->mType].size(); idxItem < cntItem; idxItem++)
{
const LLViewerInventoryItem* pCOFItem = items_by_type[itWearableData->mType].get(idxItem);
const LLViewerInventoryItem* pCOFItem = items_by_type[itWearableData->mType].at(idxItem);
if (idItem == pCOFItem->getLinkedUUID())
{
fFound = true;
@@ -218,7 +218,7 @@ public:
// LLViewerInventoryItem *item = gInventory.getItem(*it);
// if (!item)
// {
// llwarns << "fetch failed!" << llendl;
// LL_WARNS() << "fetch failed!" << LL_ENDL;
// continue;
// }
//
@@ -245,7 +245,7 @@ public:
LLViewerInventoryItem* pItem = gInventory.getItem(*itItem);
if (!pItem)
{
llwarns << "fetch failed!" << llendl;
LL_WARNS() << "fetch failed!" << LL_ENDL;
continue;
}
initial_items.push_back(pItem);
@@ -279,8 +279,8 @@ void LLInitialWearablesFetch::processWearablesMessage()
}
else
{
llinfos << "Invalid wearable, type " << wearable_data->mType << " itemID "
<< wearable_data->mItemID << " assetID " << wearable_data->mAssetID << llendl;
LL_INFOS() << "Invalid wearable, type " << wearable_data->mType << " itemID "
<< wearable_data->mItemID << " assetID " << wearable_data->mAssetID << LL_ENDL;
// delete wearable_data;
}
}
@@ -331,7 +331,7 @@ LLLibraryOutfitsFetch::LLLibraryOutfitsFetch(const LLUUID& my_outfits_id) :
mCurrFetchStep(LOFS_FOLDER),
mOutfitsPopulated(false)
{
llinfos << "created" << llendl;
LL_INFOS() << "created" << LL_ENDL;
mMyOutfitsID = LLUUID::null;
mClothingID = LLUUID::null;
@@ -342,12 +342,12 @@ LLLibraryOutfitsFetch::LLLibraryOutfitsFetch(const LLUUID& my_outfits_id) :
LLLibraryOutfitsFetch::~LLLibraryOutfitsFetch()
{
llinfos << "destroyed" << llendl;
LL_INFOS() << "destroyed" << LL_ENDL;
}
void LLLibraryOutfitsFetch::done()
{
llinfos << "start" << llendl;
LL_INFOS() << "start" << LL_ENDL;
// Delay this until idle() routine, since it's a heavy operation and
// we also can't have it run within notifyObservers.
@@ -357,7 +357,7 @@ void LLLibraryOutfitsFetch::done()
void LLLibraryOutfitsFetch::doneIdle()
{
llinfos << "start" << llendl;
LL_INFOS() << "start" << LL_ENDL;
gInventory.addObserver(this); // Add this back in since it was taken out during ::done()
@@ -383,7 +383,7 @@ void LLLibraryOutfitsFetch::doneIdle()
contentsDone();
break;
default:
llwarns << "Got invalid state for outfit fetch: " << mCurrFetchStep << llendl;
LL_WARNS() << "Got invalid state for outfit fetch: " << mCurrFetchStep << LL_ENDL;
mOutfitsPopulated = TRUE;
break;
}
@@ -399,7 +399,7 @@ void LLLibraryOutfitsFetch::doneIdle()
void LLLibraryOutfitsFetch::folderDone()
{
llinfos << "start" << llendl;
LL_INFOS() << "start" << LL_ENDL;
LLInventoryModel::cat_array_t cat_array;
LLInventoryModel::item_array_t wearable_array;
@@ -446,7 +446,7 @@ void LLLibraryOutfitsFetch::folderDone()
void LLLibraryOutfitsFetch::outfitsDone()
{
llinfos << "start" << llendl;
LL_INFOS() << "start" << LL_ENDL;
LLInventoryModel::cat_array_t cat_array;
LLInventoryModel::item_array_t wearable_array;
@@ -525,7 +525,7 @@ private:
// Copy the clothing folders from the library into the imported clothing folder
void LLLibraryOutfitsFetch::libraryDone()
{
llinfos << "start" << llendl;
LL_INFOS() << "start" << LL_ENDL;
if (mImportedClothingID != LLUUID::null)
{
@@ -550,13 +550,13 @@ void LLLibraryOutfitsFetch::libraryDone()
const LLViewerInventoryCategory *cat = gInventory.getCategory(src_folder_id);
if (!cat)
{
llwarns << "Library folder import for uuid:" << src_folder_id << " failed to find folder." << llendl;
LL_WARNS() << "Library folder import for uuid:" << src_folder_id << " failed to find folder." << LL_ENDL;
continue;
}
if (!LLAppearanceMgr::getInstance()->getCanMakeFolderIntoOutfit(src_folder_id))
{
llinfos << "Skipping non-outfit folder name:" << cat->getName() << llendl;
LL_INFOS() << "Skipping non-outfit folder name:" << cat->getName() << LL_ENDL;
continue;
}
@@ -582,7 +582,7 @@ void LLLibraryOutfitsFetch::libraryDone()
void LLLibraryOutfitsFetch::importedFolderFetch()
{
llinfos << "start" << llendl;
LL_INFOS() << "start" << LL_ENDL;
// Fetch the contents of the Imported Clothing Folder
uuid_vec_t folders;
@@ -599,7 +599,7 @@ void LLLibraryOutfitsFetch::importedFolderFetch()
void LLLibraryOutfitsFetch::importedFolderDone()
{
llinfos << "start" << llendl;
LL_INFOS() << "start" << LL_ENDL;
LLInventoryModel::cat_array_t cat_array;
LLInventoryModel::item_array_t wearable_array;
@@ -631,7 +631,7 @@ void LLLibraryOutfitsFetch::importedFolderDone()
void LLLibraryOutfitsFetch::contentsDone()
{
llinfos << "start" << llendl;
LL_INFOS() << "start" << LL_ENDL;
LLInventoryModel::cat_array_t cat_array;
LLInventoryModel::item_array_t wearable_array;
@@ -646,7 +646,7 @@ void LLLibraryOutfitsFetch::contentsDone()
const LLViewerInventoryCategory *cat = gInventory.getCategory(folder_id);
if (!cat)
{
llwarns << "Library folder import for uuid:" << folder_id << " failed to find folder." << llendl;
LL_WARNS() << "Library folder import for uuid:" << folder_id << " failed to find folder." << LL_ENDL;
continue;
}