diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-10 19:02:32 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-10 19:02:32 +0200 |
| commit | 3e13bc913f3e527b1a9d4f500ad038c06cdf6525 (patch) | |
| tree | 3e93416b19e77afdd834a581206ddcad99dc8a58 /indra/newview/llinventorymodel.cpp | |
| parent | f11c6044562571d42c76abede6fa90db2b08493f (diff) | |
| parent | 6a59342963aaf4188d1c1b104d71c31eae027d2b (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index fb9be1e04f..5d8a8805b5 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -192,6 +192,8 @@ void LLInventoryModel::cleanupInventory() BOOL LLInventoryModel::isObjectDescendentOf(const LLUUID& obj_id, const LLUUID& cat_id) const { + if (obj_id == cat_id) return TRUE; + const LLInventoryObject* obj = getObject(obj_id); while(obj) { |