diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
commit | 53495d74ee380d492cfed0af91f7660f49619a9f (patch) | |
tree | 5992e4769c9acbecc900710048a8eeb4a7806ae4 /indra/llmessage/lltransfersourceasset.cpp | |
parent | 2365dbcd459b37942ddacbcb7010232113a126c1 (diff) | |
parent | c02702f3871979cb7745b49aa502ac3c71f77681 (diff) |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llmessage/lltransfersourceasset.cpp')
-rw-r--r-- | indra/llmessage/lltransfersourceasset.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp index 7332f5c954..a8d25e3b03 100644 --- a/indra/llmessage/lltransfersourceasset.cpp +++ b/indra/llmessage/lltransfersourceasset.cpp @@ -270,6 +270,7 @@ bool is_asset_fetch_by_id_allowed(LLAssetType::EType type) case LLAssetType::AT_BODYPART: case LLAssetType::AT_ANIMATION: case LLAssetType::AT_GESTURE: + case LLAssetType::AT_MESH: rv = true; break; default: @@ -294,6 +295,7 @@ bool is_asset_id_knowable(LLAssetType::EType type) case LLAssetType::AT_GESTURE: case LLAssetType::AT_LINK: case LLAssetType::AT_LINK_FOLDER: + case LLAssetType::AT_MESH: rv = true; break; default: |