aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-14 15:56:14 +0000
committerJustin Clarke Casey2008-10-14 15:56:14 +0000
commit0d6eb37ac5703f586e2e8eeda510825c807250b2 (patch)
treea6b341134078ec4650c1346cd82f12e40baab05e /OpenSim/Region/Environment
parent* refactor: rename SendKiPrimitive to SendKillObject since this appears more ... (diff)
downloadopensim-SC_OLD-0d6eb37ac5703f586e2e8eeda510825c807250b2.zip
opensim-SC_OLD-0d6eb37ac5703f586e2e8eeda510825c807250b2.tar.gz
opensim-SC_OLD-0d6eb37ac5703f586e2e8eeda510825c807250b2.tar.bz2
opensim-SC_OLD-0d6eb37ac5703f586e2e8eeda510825c807250b2.tar.xz
* minor: Make it clear that non-scheduled updates can happen outside of the per frame update heartbeat
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityBase.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
3 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 884ff32..afdbb91 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -131,7 +131,8 @@ namespace OpenSim.Region.Environment.Scenes
131 public abstract void UpdateMovement(); 131 public abstract void UpdateMovement();
132 132
133 /// <summary> 133 /// <summary>
134 /// Performs any updates that need to be done at each frame. 134 /// Performs any updates that need to be done at each frame, as opposed to immediately.
135 /// These included scheduled updates and updates that occur due to physics processing.
135 /// </summary> 136 /// </summary>
136 public abstract void Update(); 137 public abstract void Update();
137 138
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 37f3caf..8c5afab 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1527,9 +1527,6 @@ namespace OpenSim.Region.Environment.Scenes
1527 1527
1528 #region Scheduling 1528 #region Scheduling
1529 1529
1530 /// <summary>
1531 /// Examine this object's parts to see if they've changed sufficiently to warrant an update
1532 /// </summary>
1533 public override void Update() 1530 public override void Update()
1534 { 1531 {
1535 // Check that the group was not deleted before the scheduled update 1532 // Check that the group was not deleted before the scheduled update
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 963c71b..981b15c 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -908,6 +908,7 @@ namespace OpenSim.Region.Environment.Scenes
908 908
909 } 909 }
910 } 910 }
911
911 if (PhysicsActor == null) 912 if (PhysicsActor == null)
912 { 913 {
913 return; 914 return;
@@ -1554,9 +1555,6 @@ namespace OpenSim.Region.Environment.Scenes
1554 1555
1555 #region Overridden Methods 1556 #region Overridden Methods
1556 1557
1557 /// <summary>
1558 ///
1559 /// </summary>
1560 public override void Update() 1558 public override void Update()
1561 { 1559 {
1562 SendPrimUpdates(); 1560 SendPrimUpdates();