diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-08 22:15:17 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-08 22:15:17 -0500 |
| commit | cb88b7f4a41f66249129eaa9b173ec8c206a3958 (patch) | |
| tree | 96258622b06d8c79eddfc2339d2b0323377521b1 /indra/newview/llinventorymodel.cpp | |
| parent | 7ce49586881fd078ea8bceeab558b4a156b30f63 (diff) | |
| parent | c130f5d4c9ea6ffb423f05d965168d10c6c99c05 (diff) | |
merge
--HG--
branch : avatar-pipeline
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) { |