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

Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge

avinationmerge
Melanie 2011-10-25 01:53:24 +01:00
parent 28d2103439 f2889d7ce9
commit 9dd7d9c16c
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4389,9 +4389,7 @@ namespace OpenSim.Region.Framework.Scenes
bool wasVD = VolumeDetectActive; bool wasVD = VolumeDetectActive;
if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD)) if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD))
{
return; return;
}
// Special cases for VD. VD can only be called from a script // Special cases for VD. VD can only be called from a script
// and can't be combined with changes to other states. So we can rely // and can't be combined with changes to other states. So we can rely
@ -4505,8 +4503,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
else // it already has a physical representation else // it already has a physical representation
{ {
PhysActor.IsPhysical = UsePhysics;
DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim
if (!m_parentGroup.IsDeleted) if (!m_parentGroup.IsDeleted)