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

on drop send full update on root prim, terse on others ( as sl ). Fix 

count down of number of physicial prims on attach, if removing them
avinationmerge
UbitUmarov 2014-09-08 23:44:29 +01:00
parent 25b4e268a3
commit 93143ba012
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -719,7 +719,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
// rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive,false); // rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive,false);
// not physical, not temporary, phaton, not volume detector // not physical, not temporary, phaton, not volume detector
so.UpdatePrimFlags(rootPart.LocalId,false,false,true,false); so.UpdatePrimFlags(rootPart.LocalId,false,false,true,rootPart.VolumeDetectActive);
so.HasGroupChanged = true; so.HasGroupChanged = true;
rootPart.Rezzed = DateTime.Now; rootPart.Rezzed = DateTime.Now;
@ -738,7 +738,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
// Attach (NULL) stops scripts. We don't want that. Resume them. // Attach (NULL) stops scripts. We don't want that. Resume them.
so.ResumeScripts(); so.ResumeScripts();
so.ScheduleGroupForFullUpdate(); so.ScheduleGroupForTerseUpdate();
so.RootPart.ScheduleFullUpdate();
} }
public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so) public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so)
@ -935,6 +936,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
// else // else
if (part.PhysActor != null) if (part.PhysActor != null)
{ {
if(part.PhysActor.IsPhysical)
so.Scene.RemovePhysicalPrim(1);
part.RemoveFromPhysics(); part.RemoveFromPhysics();
} }
} }