diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-05-24 17:28:30 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-05-24 17:28:30 +0300 |
| commit | 7021f95b5b09951d834cfb757b3b842313f27d49 (patch) | |
| tree | fc55e72d391f197b82ff63d50fe63bfbea677da3 /indra | |
| parent | 5db0af5327e1aa21f607c51cf9e69e3733395350 (diff) | |
MAINT-7436 FIXED [viewer-neko] Crash occurs when trying to highlight non-existent(or removed item) using SLURI
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 7ee41140f0..0ccaa1992d 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -221,7 +221,11 @@ BOOL LLInventoryModel::isObjectDescendentOf(const LLUUID& obj_id, const LLViewerInventoryCategory *LLInventoryModel::getFirstNondefaultParent(const LLUUID& obj_id) const { const LLInventoryObject* obj = getObject(obj_id); - + if(!obj) + { + LL_WARNS(LOG_INV) << "Non-existent object [ id: " << obj_id << " ] " << LL_ENDL; + return NULL; + } // Search up the parent chain until we get to root or an acceptable folder. // This assumes there are no cycles in the tree else we'll get a hang. LLUUID parent_id = obj->getParentUUID(); |