diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-07-13 12:02:14 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-07-13 12:02:14 -0500 |
| commit | 2dd3a6be720ed6ce7c17415fc8d81869cf46f3a0 (patch) | |
| tree | 54e3dfc541bca50b4907efb406e8dd423a8a1a19 /indra/llinventory | |
| parent | 7f0dd53794b843e7ce659f75ccda1f5edb079186 (diff) | |
Fix for mesh upload, consolidate generating bad indices, and normal generation.
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventorytype.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp index 82cd22a832..5c5500b6f4 100644 --- a/indra/llinventory/llinventorytype.cpp +++ b/indra/llinventory/llinventorytype.cpp @@ -89,10 +89,7 @@ LLInventoryDictionary::LLInventoryDictionary() addEntry(LLInventoryType::IT_WEARABLE, new InventoryEntry("wearable", "wearable", 2, LLAssetType::AT_CLOTHING, LLAssetType::AT_BODYPART)); addEntry(LLInventoryType::IT_ANIMATION, new InventoryEntry("animation", "animation", 1, LLAssetType::AT_ANIMATION)); addEntry(LLInventoryType::IT_GESTURE, new InventoryEntry("gesture", "gesture", 1, LLAssetType::AT_GESTURE)); -#if LL_MESH_ENABLED addEntry(LLInventoryType::IT_MESH, new InventoryEntry("mesh", "mesh", 1, LLAssetType::AT_MESH)); -#endif - } @@ -152,9 +149,7 @@ DEFAULT_ASSET_FOR_INV_TYPE[LLAssetType::AT_COUNT] = LLInventoryType::IT_NONE, // AT_NONE LLInventoryType::IT_NONE, // AT_NONE LLInventoryType::IT_NONE, // AT_NONE -#if LL_MESH_ENABLED LLInventoryType::IT_MESH // AT_MESH -#endif }; // static |