livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-4128 WIP - misc cleanup

meow-7.2.2
Brad Payne (Vir Linden) 2013-04-24 18:38:40 -04:00
parent eb88e4d378
commit d73588eadd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llinventorymodel.cpp
View File

@ -1178,11 +1178,11 @@ void LLInventoryModel::deleteObject(const LLUUID& id)
mParentChildCategoryTree.erase(id);
}
addChangedMask(LLInventoryObserver::REMOVE, id);
obj = NULL; // delete obj
// Can't have links to links, so there's no need for this update
// if the item removed is a link.
bool is_link_type = obj->getIsLinkType();
obj = NULL; // delete obj
if (!is_link_type)
{
updateLinkedObjectsFromPurge(id);

2
indra/newview/llpaneleditwearable.cpp
View File

@ -1113,7 +1113,7 @@ void LLPanelEditWearable::saveChanges(bool force_save_as)
LLAssetType::AT_LINK,
NULL);
// Remove old link
remove_inventory_item(link_item->getUUID());
remove_inventory_item(link_item->getUUID(), NULL);
}
gAgentWearables.saveWearable(mWearablePtr->getType(), index, TRUE, new_name);
}

2
indra/newview/llviewerinventory.cpp
View File

@ -1276,7 +1276,7 @@ void remove_inventory_item(
}
else
{
llwarns << "remove_inventory_item called for nonexistent item " << item_id << llendl;
llwarns << "remove_inventory_item called for invalid or nonexistent item " << item_id << llendl;
}
}