diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-07 14:08:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-07 14:08:36 -0400 |
| commit | 5d92dc44026f7dd237aa871593080fd151064e62 (patch) | |
| tree | 4f0c70e428824a0a01e38ff77850fb009b6c13f0 /indra/newview/llinventorymodel.cpp | |
| parent | 7614ceff24129643ecb96f57f0491507e4ff8dbd (diff) | |
| parent | 4d77146b9016a4db37112e153e71c05c596f7fdc (diff) | |
merge changes for 2.7.4 release
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; |