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

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-06-21 20:07:56 +02:00
parent 9b5f840d19 c8f7cd60cd
commit 25e4fda7a1
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4496,6 +4496,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (pa != null) if (pa != null)
{ {
if(wasUsingPhysics)
ParentGroup.Scene.RemovePhysicalPrim(1); ParentGroup.Scene.RemovePhysicalPrim(1);
RemoveFromPhysics(); RemoveFromPhysics();
} }
@ -4545,7 +4546,6 @@ namespace OpenSim.Region.Framework.Scenes
pa.SetVolumeDetect(0); pa.SetVolumeDetect(0);
*/ */
if (pa.Building != building) if (pa.Building != building)
pa.Building = building; pa.Building = building;
} }