Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge

This commit is contained in:
Melanie
2011-10-25 01:51:24 +01:00
7 changed files with 15 additions and 8 deletions

View File

@@ -3071,7 +3071,7 @@ namespace OpenSim.Region.Framework.Scenes
//if (LocalId != ParentGroup.RootPart.LocalId)
//isattachment = ParentGroup.RootPart.IsAttachment;
remoteClient.SendPrimUpdate(this, PrimUpdateFlags.FullUpdate);
remoteClient.SendEntityUpdate(this, PrimUpdateFlags.FullUpdate);
ParentGroup.Scene.StatsReporter.AddObjectUpdates(1);
}
@@ -4849,7 +4849,7 @@ namespace OpenSim.Region.Framework.Scenes
// Causes this thread to dig into the Client Thread Data.
// Remember your locking here!
remoteClient.SendPrimUpdate(
remoteClient.SendEntityUpdate(
this,
PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
| PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);