aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs27
1 files changed, 14 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cdabd45..4d3ab51 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -110,15 +110,10 @@ namespace OpenSim.Region.Framework.Scenes
110 110
111 public UUID currentParcelUUID = UUID.Zero; 111 public UUID currentParcelUUID = UUID.Zero;
112 112
113 protected ScenePresenceAnimator m_animator;
114 /// <value> 113 /// <value>
115 /// The animator for this avatar 114 /// The animator for this avatar
116 /// </value> 115 /// </value>
117 public ScenePresenceAnimator Animator 116 public ScenePresenceAnimator Animator { get; private set; }
118 {
119 get { return m_animator; }
120 private set { m_animator = value; }
121 }
122 117
123 /// <summary> 118 /// <summary>
124 /// Attachments recorded on this avatar. 119 /// Attachments recorded on this avatar.
@@ -2763,8 +2758,7 @@ namespace OpenSim.Region.Framework.Scenes
2763 //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID); 2758 //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID);
2764 2759
2765 avatar.ControllingClient.SendAvatarDataImmediate(this); 2760 avatar.ControllingClient.SendAvatarDataImmediate(this);
2766 if (Animator != null) 2761 Animator.SendAnimPackToClient(avatar.ControllingClient);
2767 Animator.SendAnimPackToClient(avatar.ControllingClient);
2768 } 2762 }
2769 2763
2770 /// <summary> 2764 /// <summary>
@@ -3440,6 +3434,16 @@ namespace OpenSim.Region.Framework.Scenes
3440 if (IsChildAgent) 3434 if (IsChildAgent)
3441 return; 3435 return;
3442 3436
3437 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
3438 // The Physics Scene will send updates every 500 ms grep: PhysicsActor.SubscribeEvents(
3439 // as of this comment the interval is set in AddToPhysicalScene
3440
3441// if (m_updateCount > 0)
3442// {
3443 Animator.UpdateMovementAnimations();
3444// m_updateCount--;
3445// }
3446
3443 CollisionEventUpdate collisionData = (CollisionEventUpdate)e; 3447 CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
3444 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList; 3448 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
3445 3449
@@ -3453,7 +3457,7 @@ namespace OpenSim.Region.Framework.Scenes
3453// m_lastColCount = coldata.Count; 3457// m_lastColCount = coldata.Count;
3454// } 3458// }
3455 3459
3456 if (coldata.Count != 0 && Animator != null) 3460 if (coldata.Count != 0)
3457 { 3461 {
3458 switch (Animator.CurrentMovementAnimation) 3462 switch (Animator.CurrentMovementAnimation)
3459 { 3463 {
@@ -3565,7 +3569,7 @@ namespace OpenSim.Region.Framework.Scenes
3565 ControllingClient.SendHealth(Health); 3569 ControllingClient.SendHealth(Health);
3566 } 3570 }
3567 3571
3568 public void Close() 3572 protected internal void Close()
3569 { 3573 {
3570 // Clear known regions 3574 // Clear known regions
3571 KnownRegions = new Dictionary<ulong, string>(); 3575 KnownRegions = new Dictionary<ulong, string>();
@@ -3581,9 +3585,6 @@ namespace OpenSim.Region.Framework.Scenes
3581 // m_reprioritizationTimer.Dispose(); 3585 // m_reprioritizationTimer.Dispose();
3582 3586
3583 RemoveFromPhysicalScene(); 3587 RemoveFromPhysicalScene();
3584 if(Animator != null)
3585 Animator.Close();
3586 Animator = null;
3587 } 3588 }
3588 3589
3589 public void AddAttachment(SceneObjectGroup gobj) 3590 public void AddAttachment(SceneObjectGroup gobj)