diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-08-29 15:43:02 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-08-29 15:43:02 +0300 |
| commit | e439f0366fffe336ad42c09596427ef35596992c (patch) | |
| tree | 5f998d175b411c76691388f1909dd5ebda0cc202 /indra/newview/llagentwearables.cpp | |
| parent | d13b4d18030ec5748adf7960a3a5ce367440f96e (diff) | |
| parent | 5986bf4826d04027a17a098d1b80064aabde5a7b (diff) | |
Merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
| -rw-r--r-- | indra/newview/llagentwearables.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 170e4063a1..15e4de8f69 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1538,6 +1538,12 @@ void LLAgentWearables::createWearable(LLWearableType::EType type, bool wear, con { if (type == LLWearableType::WT_INVALID || type == LLWearableType::WT_NONE) return; + if (type == LLWearableType::WT_UNIVERSAL && !gAgent.getRegion()->bakesOnMeshEnabled()) + { + LL_WARNS("Inventory") << "Can't create WT_UNIVERSAL type " << LL_ENDL; + return; + } + LLViewerWearable* wearable = LLWearableList::instance().createNewWearable(type, gAgentAvatarp); LLAssetType::EType asset_type = wearable->getAssetType(); LLInventoryType::EType inv_type = LLInventoryType::IT_WEARABLE; |