diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-12 20:29:07 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-12 20:29:07 -0500 |
| commit | 2ea1b06440369d059eb67eb47dc4945975dbdc65 (patch) | |
| tree | 5f82cbf7f826e51b7705a699df490e12198a406c /indra/newview/llinventorybridge.cpp | |
| parent | 1bbcc4be8359b177aca093be0b451c12212f8a7d (diff) | |
Backed out changeset: 153709ddee86
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 10c4b620df..1bc9297bba 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3889,11 +3889,16 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model gMessageSystem->sendReliable( gAgent.getRegion()->getHost());
}
// this object might have been selected, so let the selection manager know it's gone now
- LLViewerObject *found_obj = gObjectList.findObject(item->getLinkedUUID());
+ LLViewerObject *found_obj =
+ gObjectList.findObject(item->getUUID());
if (found_obj)
{
LLSelectMgr::getInstance()->remove(found_obj);
}
+ else
+ {
+ llwarns << "object not found - ignoring" << llendl;
+ }
}
else LLItemBridge::performAction(folder, model, action);
}
|