diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-04 12:17:01 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-04 12:17:01 -0700 |
| commit | fc6c3fbe4271dcd9b64bdfd417514dc97ad7dd75 (patch) | |
| tree | bd09a20a2b4dd9384a92114eaeebe0d5bfac8e1e /indra/newview/llviewerassettype.cpp | |
| parent | f3aac4c8ab45d52c4f038ad1a16768d9d8e0b201 (diff) | |
| parent | 44e9fb446f3c92c3dfd9b5be8a3e02ec5a44ba00 (diff) | |
Merge with latest
Diffstat (limited to 'indra/newview/llviewerassettype.cpp')
| -rw-r--r-- | indra/newview/llviewerassettype.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerassettype.cpp b/indra/newview/llviewerassettype.cpp index b103f11597..a4b1c2155f 100644 --- a/indra/newview/llviewerassettype.cpp +++ b/indra/newview/llviewerassettype.cpp @@ -80,7 +80,9 @@ LLViewerAssetDictionary::LLViewerAssetDictionary() addEntry(LLViewerAssetType::AT_LINK_FOLDER, new ViewerAssetEntry(DAD_LINK)); addEntry(LLViewerAssetType::AT_MESH, new ViewerAssetEntry(DAD_MESH)); - + + addEntry(LLViewerAssetType::AT_WIDGET, new ViewerAssetEntry(DAD_WIDGET)); + addEntry(LLViewerAssetType::AT_NONE, new ViewerAssetEntry(DAD_NONE)); }; |