diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-25 09:12:36 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-25 09:12:36 -0400 |
| commit | e03f25d51a5840d9d4f29d0ee238ed4b881b8cee (patch) | |
| tree | 7d8ad6f2fd58abc004388c8174293ee78bb927bd /indra/newview/llinventorymodel.cpp | |
| parent | bc0df31d1beaa6eddd48431eb9e42d38d3698673 (diff) | |
| parent | cb797532c0bd7ca0ab4caf66c48aa55ec99160a0 (diff) | |
automated merge mesh-development -> mesh-development
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 b5180854ef..318beafe65 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -632,10 +632,12 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item) } // We're hiding mesh types +#if 0 if (item->getType() == LLAssetType::AT_MESH) { return mask; } +#endif LLViewerInventoryItem* old_item = getItem(item->getUUID()); LLPointer<LLViewerInventoryItem> new_item; |