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

avinationmerge
ubit 2012-06-21 20:07:56 +02:00
commit 25e4fda7a1
1 changed files with 28 additions and 28 deletions

View File

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