aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs7
3 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 33afc40..ec209ed 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -998,7 +998,7 @@ namespace OpenSim.Region.Framework.Scenes
998 physicsMS2 = Environment.TickCount - physicsMS2; 998 physicsMS2 = Environment.TickCount - physicsMS2;
999 999
1000 if (m_frame % m_update_entitymovement == 0) 1000 if (m_frame % m_update_entitymovement == 0)
1001 m_sceneGraph.UpdateEntityMovement(); 1001 m_sceneGraph.UpdateScenePresenceMovement();
1002 1002
1003 physicsMS = Environment.TickCount; 1003 physicsMS = Environment.TickCount;
1004 if ((m_frame % m_update_physics == 0) && m_physics_enabled) 1004 if ((m_frame % m_update_physics == 0) && m_physics_enabled)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 3007598..48dea07 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -198,9 +198,9 @@ namespace OpenSim.Region.Framework.Scenes
198 } 198 }
199 } 199 }
200 200
201 protected internal void UpdateEntityMovement() 201 protected internal void UpdateScenePresenceMovement()
202 { 202 {
203 List<EntityBase> moveEntities = GetEntities(); 203 List<ScenePresence> moveEntities = GetScenePresences();
204 204
205 foreach (EntityBase entity in moveEntities) 205 foreach (EntityBase entity in moveEntities)
206 { 206 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index d72ed7d..5be074e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1904,7 +1904,7 @@ namespace OpenSim.Region.Framework.Scenes
1904 //return; 1904 //return;
1905 //} 1905 //}
1906 1906
1907 if (Util.DistanceLessThan(lastPhysGroupPos, AbsolutePosition, 0.02) && UsePhysics) 1907 if (UsePhysics && Util.DistanceLessThan(lastPhysGroupPos, AbsolutePosition, 0.02))
1908 { 1908 {
1909 m_rootPart.UpdateFlag = 1; 1909 m_rootPart.UpdateFlag = 1;
1910 lastPhysGroupPos = AbsolutePosition; 1910 lastPhysGroupPos = AbsolutePosition;
@@ -1916,11 +1916,10 @@ namespace OpenSim.Region.Framework.Scenes
1916 1916
1917 checkAtTargets(); 1917 checkAtTargets();
1918 1918
1919 if (((Math.Abs(lastPhysGroupRot.W - GroupRotation.W) > 0.1) 1919 if (UsePhysics && ((Math.Abs(lastPhysGroupRot.W - GroupRotation.W) > 0.1)
1920 || (Math.Abs(lastPhysGroupRot.X - GroupRotation.X) > 0.1) 1920 || (Math.Abs(lastPhysGroupRot.X - GroupRotation.X) > 0.1)
1921 || (Math.Abs(lastPhysGroupRot.Y - GroupRotation.Y) > 0.1) 1921 || (Math.Abs(lastPhysGroupRot.Y - GroupRotation.Y) > 0.1)
1922 || (Math.Abs(lastPhysGroupRot.Z - GroupRotation.Z) > 0.1)) 1922 || (Math.Abs(lastPhysGroupRot.Z - GroupRotation.Z) > 0.1)))
1923 && UsePhysics)
1924 { 1923 {
1925 m_rootPart.UpdateFlag = 1; 1924 m_rootPart.UpdateFlag = 1;
1926 1925