diff options
| author | James Cook <james@lindenlab.com> | 2009-12-09 13:24:21 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-09 13:24:21 -0800 |
| commit | 6260ce6a9210192963a77e5b1f44b0d2c2c86591 (patch) | |
| tree | 949f5d4e19149ecea3d4dd05f72e1a480aaf8c38 /indra/newview/llinventorymodel.cpp | |
| parent | 7193e97b982d69de75ee6bb5769f5e53ccfb517d (diff) | |
| parent | 883ef71722a27fdb1c09abfa4a4421569d416cd2 (diff) | |
Merge
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) { |