diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-09-10 12:07:01 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-09-10 12:07:01 -0700 |
| commit | 3609eabe5460023d1460664feb5de10d68457725 (patch) | |
| tree | 533d03aadf36730eb59c2627cfd09e35593dd03c /indra/newview/llinventorymodel.cpp | |
| parent | 3191a5ddc9b3512b79a8505072d13583eb9012c6 (diff) | |
| parent | e241670694959833feaa0e667222b337095eb683 (diff) | |
Merge viewer-release 6.3.2
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 412b684c96..17e80dca89 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -888,13 +888,10 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask) return mask; } - // We're hiding mesh types -#if 0 if (item->getType() == LLAssetType::AT_MESH) { return mask; } -#endif LLPointer<LLViewerInventoryItem> old_item = getItem(item->getUUID()); LLPointer<LLViewerInventoryItem> new_item; |