diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-16 10:28:35 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-16 10:28:35 +0000 |
commit | aa7fadfde02d396ab04c82f91f01d486b4f5396d (patch) | |
tree | 21e0e919da0ad23f3a39b5128ba5313f0f8a78d5 /indra/llcommon/llassettype.cpp | |
parent | e3367fad368660bf40db29a82237475a9f2dfdbd (diff) | |
parent | 9c5e4d315a4b5f5a0793587c6a6620f6efc76332 (diff) |
merge from viewer2.
Diffstat (limited to 'indra/llcommon/llassettype.cpp')
-rw-r--r-- | indra/llcommon/llassettype.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp index 6d5b12d840..3ea742957e 100644 --- a/indra/llcommon/llassettype.cpp +++ b/indra/llcommon/llassettype.cpp @@ -94,6 +94,8 @@ LLAssetDictionary::LLAssetDictionary() addEntry(LLAssetType::AT_LINK, new AssetEntry("LINK", "link", "symbolic link", FALSE)); addEntry(LLAssetType::AT_LINK_FOLDER, new AssetEntry("FOLDER_LINK", "link_f", "symbolic folder link", FALSE)); + addEntry(LLAssetType::AT_MESH, new AssetEntry("MESH", "mesh", "mesh", FALSE)); + addEntry(LLAssetType::AT_NONE, new AssetEntry("NONE", "-1", NULL, FALSE)); }; |