diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:51:35 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:51:35 +0000 |
commit | 49b37a4dc362679e94fe04ff3cd7094f0e0e9f68 (patch) | |
tree | 9832afd6820bc0122fb8eef0552bbfab58736492 /indra/newview/llviewerassettype.cpp | |
parent | c3a71b7dcbfe855058a84e22651aea3910133aa1 (diff) | |
parent | 8bafcc0491d0131a53226365f18b3ba68648a742 (diff) |
merge from viewer2, conflicts resolved...
Diffstat (limited to 'indra/newview/llviewerassettype.cpp')
-rw-r--r-- | indra/newview/llviewerassettype.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerassettype.cpp b/indra/newview/llviewerassettype.cpp index b382ff6306..4c088a72b7 100644 --- a/indra/newview/llviewerassettype.cpp +++ b/indra/newview/llviewerassettype.cpp @@ -85,6 +85,8 @@ LLViewerAssetDictionary::LLViewerAssetDictionary() addEntry(LLViewerAssetType::AT_LINK, new ViewerAssetEntry(DAD_LINK)); addEntry(LLViewerAssetType::AT_LINK_FOLDER, new ViewerAssetEntry(DAD_LINK)); + addEntry(LLViewerAssetType::AT_MESH, new ViewerAssetEntry(DAD_MESH)); + addEntry(LLViewerAssetType::AT_NONE, new ViewerAssetEntry(DAD_NONE)); }; |