From 3992875627514db275e9e394a538c0b8d597920c Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 5 Nov 2019 12:25:23 +0200
Subject: [PATCH] SL-12227 FIXED Copied physics data always applies physics
material as Stone.
---
indra/newview/llpanelobject.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 01fa9cc0748..8a5034db85e 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -2318,7 +2318,7 @@ void LLPanelObject::onPasteParams()
{
objectp->setPhysicsShapeType((U8)mParamsClipboard["physics"]["shape"].asInteger());
U8 cur_material = objectp->getMaterial();
- U8 material = (U8)mParamsClipboard["physics_material"].asInteger() | (cur_material & ~LL_MCODE_MASK);
+ U8 material = (U8)mParamsClipboard["physics"]["material"].asInteger() | (cur_material & ~LL_MCODE_MASK);
objectp->setMaterial(material);
objectp->sendMaterialUpdate();
--
GitLab