aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorJeff Ames2010-02-15 19:15:03 +0900
committerJeff Ames2010-02-15 19:21:56 +0900
commitaf265e001d3bf043590e480cd6574a14193f6de0 (patch)
tree168217a56ba0d25d0fa063df6c27f8cbdca4bf67 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentFixes a bug in the previous patch. (diff)
downloadopensim-SC-af265e001d3bf043590e480cd6574a14193f6de0.zip
opensim-SC-af265e001d3bf043590e480cd6574a14193f6de0.tar.gz
opensim-SC-af265e001d3bf043590e480cd6574a14193f6de0.tar.bz2
opensim-SC-af265e001d3bf043590e480cd6574a14193f6de0.tar.xz
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7cdea05..4973663 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -227,7 +227,7 @@ namespace OpenSim.Region.Framework.Scenes
227 // Agent's Draw distance. 227 // Agent's Draw distance.
228 protected float m_DrawDistance; 228 protected float m_DrawDistance;
229 229
230 protected AvatarAppearance m_appearance; 230 protected AvatarAppearance m_appearance;
231 231
232 // neighbouring regions we have enabled a child agent in 232 // neighbouring regions we have enabled a child agent in
233 // holds the seed cap for the child agent in that region 233 // holds the seed cap for the child agent in that region
@@ -648,7 +648,7 @@ namespace OpenSim.Region.Framework.Scenes
648 #region Constructor(s) 648 #region Constructor(s)
649 649
650 public ScenePresence() 650 public ScenePresence()
651 { 651 {
652 m_sendCourseLocationsMethod = SendCoarseLocationsDefault; 652 m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
653 CreateSceneViewer(); 653 CreateSceneViewer();
654 m_animator = new ScenePresenceAnimator(this); 654 m_animator = new ScenePresenceAnimator(this);
@@ -3265,7 +3265,7 @@ namespace OpenSim.Region.Framework.Scenes
3265 m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; 3265 m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
3266 m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong 3266 m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
3267 m_physicsActor.SubscribeEvents(500); 3267 m_physicsActor.SubscribeEvents(500);
3268 m_physicsActor.LocalID = LocalId; 3268 m_physicsActor.LocalID = LocalId;
3269 } 3269 }
3270 3270
3271 private void OutOfBoundsCall(Vector3 pos) 3271 private void OutOfBoundsCall(Vector3 pos)
@@ -3357,7 +3357,7 @@ namespace OpenSim.Region.Framework.Scenes
3357 } 3357 }
3358 if (m_health <= 0) 3358 if (m_health <= 0)
3359 m_scene.EventManager.TriggerAvatarKill(killerObj, this); 3359 m_scene.EventManager.TriggerAvatarKill(killerObj, this);
3360 } 3360 }
3361 } 3361 }
3362 3362
3363 public void setHealthWithUpdate(float health) 3363 public void setHealthWithUpdate(float health)