diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 17:45:50 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 17:45:50 +0000 |
| commit | ed26b11f6867d8938afd214ef9b5da80f7ef7be7 (patch) | |
| tree | 84e70c00869ce01c520375508ea8b52b44959704 | |
| parent | 5707b71d090306d05dd09933985294e8c7d136a9 (diff) | |
CID-89
Checker: FORWARD_NULL
Function: LLObjectBridge::performAction(LLFolderView *, LLInventoryModel *, std::basic_string<char, std::char_traits<char>, std::allocator<char>>)
File: /indra/newview/llinventorybridge.cpp
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 59ca6063c8..db182ae8d3 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4068,12 +4068,13 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); gMessageSystem->addUUIDFast(_PREHASH_ItemID, item->getLinkedUUID()); 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()); - if (found_obj) - { - LLSelectMgr::getInstance()->remove(found_obj); + + // this object might have been selected, so let the selection manager know it's gone now + LLViewerObject *found_obj = gObjectList.findObject(item->getLinkedUUID()); + if (found_obj) + { + LLSelectMgr::getInstance()->remove(found_obj); + } } } else LLItemBridge::performAction(folder, model, action); |