diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-10 16:06:01 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-10 16:06:01 +0200 |
| commit | 6f5b47a4e7128d8e7b2f8a46c498a971ad39900e (patch) | |
| tree | 181b43d1a870bff0863e3f7c0a4a752993cc9d4e /indra/newview/llinventorymodel.cpp | |
| parent | 4df594defc4ad7f21139d99fb95197a0aa78854b (diff) | |
| parent | 562d343c47570731664b34507359c823cfcbd634 (diff) | |
Merge from default branch.
--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) { |