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

6
indra/newview/scriptcounter.cpp
View File

@@ -123,7 +123,7 @@ void ScriptCounter::requestInventoriesFor(LLViewerObject* object)
// Request inventory for each individual prim
void ScriptCounter::requestInventoryFor(LLViewerObject* object)
{
//llinfos << "Requesting inventory of " << object->getID() << llendl;
//LL_INFOS() << "Requesting inventory of " << object->getID() << LL_ENDL;
++inventories;
object->registerInventoryListener(this, NULL);
object->dirtyInventory();
@@ -136,7 +136,7 @@ void ScriptCounter::inventoryChanged(LLViewerObject* obj, LLInventoryObject::obj
obj->removeInventoryListener(this);
--inventories;
//const LLUUID& objid = obj->getID();
//llinfos << "Counting scripts in " << objid << llendl;
//LL_INFOS() << "Counting scripts in " << objid << LL_ENDL;
if (inv)
{
@@ -151,7 +151,7 @@ void ScriptCounter::inventoryChanged(LLViewerObject* obj, LLInventoryObject::obj
const LLUUID& id = asset->getUUID();
if (id.notNull())
{
//llinfos << "Deleting script " << id << " in " << objid << llendl;
//LL_INFOS() << "Deleting script " << id << " in " << objid << LL_ENDL;
obj->removeInventory(id);
--i; // Avoid iteration when removing, everything has shifted
end = inv->end();