Skip to content
Snippets Groups Projects
Commit 39928756 authored by maxim_productengine's avatar maxim_productengine
Browse files

SL-12227 FIXED Copied physics data always applies physics material as Stone.

parent baf86263
No related branches found
No related tags found
1 merge request!83Merge Linden 6.6.7
...@@ -2318,7 +2318,7 @@ void LLPanelObject::onPasteParams() ...@@ -2318,7 +2318,7 @@ void LLPanelObject::onPasteParams()
{ {
objectp->setPhysicsShapeType((U8)mParamsClipboard["physics"]["shape"].asInteger()); objectp->setPhysicsShapeType((U8)mParamsClipboard["physics"]["shape"].asInteger());
U8 cur_material = objectp->getMaterial(); 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->setMaterial(material);
objectp->sendMaterialUpdate(); objectp->sendMaterialUpdate();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment