aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:29:35 +0100
committerMelanie2011-10-12 07:29:35 +0100
commite3effc497474411c58861a46c17548ca6227e26e (patch)
tree981df9a31ce80f363d4b7c52b15a74a7e44705e1 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge (diff)
parentStart recording object updates per second statistic (analogue of agent update... (diff)
downloadopensim-SC-e3effc497474411c58861a46c17548ca6227e26e.zip
opensim-SC-e3effc497474411c58861a46c17548ca6227e26e.tar.gz
opensim-SC-e3effc497474411c58861a46c17548ca6227e26e.tar.bz2
opensim-SC-e3effc497474411c58861a46c17548ca6227e26e.tar.xz
Merge branch 'master' into bigmerge
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 1a96f1b..c6264b5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3072,6 +3072,7 @@ namespace OpenSim.Region.Framework.Scenes
3072 //isattachment = ParentGroup.RootPart.IsAttachment; 3072 //isattachment = ParentGroup.RootPart.IsAttachment;
3073 3073
3074 remoteClient.SendPrimUpdate(this, PrimUpdateFlags.FullUpdate); 3074 remoteClient.SendPrimUpdate(this, PrimUpdateFlags.FullUpdate);
3075 ParentGroup.Scene.StatsReporter.AddObjectUpdates(1);
3075 } 3076 }
3076 3077
3077 /// <summary> 3078 /// <summary>
@@ -4848,7 +4849,12 @@ namespace OpenSim.Region.Framework.Scenes
4848 4849
4849 // Causes this thread to dig into the Client Thread Data. 4850 // Causes this thread to dig into the Client Thread Data.
4850 // Remember your locking here! 4851 // Remember your locking here!
4851 remoteClient.SendPrimUpdate(this, PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity); 4852 remoteClient.SendPrimUpdate(
4853 this,
4854 PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
4855 | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);
4856
4857 ParentGroup.Scene.StatsReporter.AddObjectUpdates(1);
4852 } 4858 }
4853 4859
4854 public void AddScriptLPS(int count) 4860 public void AddScriptLPS(int count)