summaryrefslogtreecommitdiff
path: root/indra/newview/llagentwearables.cpp
diff options
context:
space:
mode:
authorAnchor Linden <anchor@lindenlab.com>2018-07-19 22:46:03 +0530
committerAnchor Linden <anchor@lindenlab.com>2018-07-19 22:46:03 +0530
commit7318bd61f7a7ea89e471a6e0f3cc310786a3b41c (patch)
tree431aa003f9817b98c363eb570e2e70d8b3e7b290 /indra/newview/llagentwearables.cpp
parent063d30e409d64d12a9ac3ca2d0328b55e49717f3 (diff)
[MAINT-8873] - check for bakesOnMesh enabled sim feature, before creating universal wearable type
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
-rw-r--r--indra/newview/llagentwearables.cpp6
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;