diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-26 12:35:18 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-26 12:35:18 -0700 |
| commit | 723f1891db513acf36e0d20bdd93a615c31a5337 (patch) | |
| tree | f1d3edca4e3bc5dfb68964c9b201c41b728eff33 /indra/newview/llagentwearables.cpp | |
| parent | 00eddaf23fbe6761e6a78500b42d076f7a1551fa (diff) | |
| parent | 5986bf4826d04027a17a098d1b80064aabde5a7b (diff) | |
Merge 6.3.1 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 2b865a1ae2..b9fd4177c1 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1536,6 +1536,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(); LLPointer<LLInventoryCallback> cb; |