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

mPendingInventoryItemsIDs wasn't having entries removed.

Browse Source
This commit is contained in:
Shyotl
2012-07-14 19:44:06 -05:00
parent f8445030c7
commit 08ab36a5d9
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llviewerobject.cpp
View File

@@ -2874,6 +2874,23 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS
(object = gObjectList.findObject(ft->mTaskID))) (object = gObjectList.findObject(ft->mTaskID)))
{ {
object->loadTaskInvFile(ft->mFilename); object->loadTaskInvFile(ft->mFilename);
LLInventoryObject::object_list_t::iterator it = object->mInventory->begin();
LLInventoryObject::object_list_t::iterator end = object->mInventory->end();
std::list<LLUUID>& pending_lst = object->mPendingInventoryItemsIDs;
for (; it != end && pending_lst.size(); ++it)
{
LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(it->get());
if(item && item->getType() != LLAssetType::AT_CATEGORY)
{
std::list<LLUUID>::iterator id_it = std::find(pending_lst.begin(), pending_lst.begin(), item->getAssetUUID());
if (id_it != pending_lst.end())
{
pending_lst.erase(id_it);
}
}
}
} }
else else
{ {
@@ -4894,9 +4911,11 @@ void LLViewerObject::deleteParticleSource()
// virtual // virtual
void LLViewerObject::updateDrawable(BOOL force_damped) void LLViewerObject::updateDrawable(BOOL force_damped)
{ {
if (mDrawable.notNull() && if (!isChanged(MOVED))
!mDrawable->isState(LLDrawable::ON_MOVE_LIST) && { //most common case, having an empty if case here makes for better branch prediction
isChanged(MOVED)) }
else if (mDrawable.notNull() &&
!mDrawable->isState(LLDrawable::ON_MOVE_LIST))
{ {
BOOL damped_motion = BOOL damped_motion =
!isChanged(SHIFTED) && // not shifted between regions this frame and... !isChanged(SHIFTED) && // not shifted between regions this frame and...