OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a bad reset of shapetype on pbshape change, added missing checksculpload ( to reload mesh on change )

avinationmerge
UbitUmarov 2012-03-21 15:27:33 +00:00
parent a03c55fee7
commit 68736aa460
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -989,7 +989,6 @@ namespace OpenSim.Region.Framework.Scenes
set set
{ {
m_shape = value; m_shape = value;
m_physicsShapeType = DefaultPhysicsShapeType();
} }
} }
@ -1003,7 +1002,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (m_shape != null) if (m_shape != null)
{ {
// StoreUndoState();
m_shape.Scale = value; m_shape.Scale = value;
@ -1498,6 +1496,7 @@ namespace OpenSim.Region.Framework.Scenes
set set
{ {
byte oldv = m_physicsShapeType; byte oldv = m_physicsShapeType;
if (value >= 0 && value <= (byte)PhysShapeType.convex) if (value >= 0 && value <= (byte)PhysShapeType.convex)
{ {
if (value == (byte)PhysShapeType.none && ParentGroup != null && ParentGroup.RootPart == this) if (value == (byte)PhysShapeType.none && ParentGroup != null && ParentGroup.RootPart == this)
@ -1508,7 +1507,6 @@ namespace OpenSim.Region.Framework.Scenes
else else
m_physicsShapeType = DefaultPhysicsShapeType(); m_physicsShapeType = DefaultPhysicsShapeType();
if (m_physicsShapeType != oldv && ParentGroup != null) if (m_physicsShapeType != oldv && ParentGroup != null)
{ {
if (m_physicsShapeType == (byte)PhysShapeType.none) if (m_physicsShapeType == (byte)PhysShapeType.none)
@ -1526,13 +1524,18 @@ namespace OpenSim.Region.Framework.Scenes
else if (PhysActor == null) else if (PhysActor == null)
ApplyPhysics((uint)Flags, VolumeDetectActive, false); ApplyPhysics((uint)Flags, VolumeDetectActive, false);
else else
{
PhysActor.PhysicsShapeType = m_physicsShapeType; PhysActor.PhysicsShapeType = m_physicsShapeType;
} if (Shape.SculptEntry)
if (m_physicsShapeType != value) CheckSculptAndLoad();
{ }
if (ParentGroup != null) if (ParentGroup != null)
ParentGroup.HasGroupChanged = true; ParentGroup.HasGroupChanged = true;
}
if (m_physicsShapeType != value)
{
UpdatePhysRequired = true; UpdatePhysRequired = true;
} }
} }