diff options
author | maxim_productengine <mnikolenko@productengine.com> | 2019-11-05 12:25:23 +0200 |
---|---|---|
committer | maxim_productengine <mnikolenko@productengine.com> | 2019-11-05 12:25:23 +0200 |
commit | 3992875627514db275e9e394a538c0b8d597920c (patch) | |
tree | cd79890442d561ae4c3dbf3aa666e58f8d4ad47f | |
parent | baf86263e6dc1fe7f964e5885d6bed753554dad7 (diff) |
SL-12227 FIXED Copied physics data always applies physics material as Stone.
-rw-r--r-- | indra/newview/llpanelobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 01fa9cc074..8a5034db85 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(); |