From 561b87b303e8e141ef516b8725ebd3c0be8b1122 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 11 Jul 2007 02:51:51 +0000
Subject: * Applying dalien's patches from bug#177 and #179

---
 OpenSim/Region/Environment/Scenes/Scene.cs         | 22 +++++++++++++++
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 31 +++++++++++++++++-----
 2 files changed, 46 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index cd81384..d1f6038 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -546,6 +546,28 @@ namespace OpenSim.Region.Environment.Scenes
         {
             eventManager.TriggerOnRemovePresence(agentID);
 
+	    ScenePresence avatar = this.RequestAvatar(agentID);
+
+            m_clientManager.ForEachClient(
+	        delegate(IClientAPI client)
+                {
+                    client.SendKillObject(avatar.RegionHandle, avatar.LocalId);
+                });
+ 
+            lock (Avatars) {
+                 if (Avatars.ContainsKey(agentID)) {
+                    Avatars.Remove(agentID);
+                }
+            }
+             lock (Entities) {
+                 if (Entities.ContainsKey(agentID)) {
+                    Entities.Remove(agentID);
+                }
+            }
+            // TODO: Add the removal from physics ?
+ 
+
+
             return;
         }
         #endregion
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 7330bc5..e65ab7c 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -91,6 +91,12 @@ namespace OpenSim.Region.Environment.Scenes
                 return _physActor;
             }
         }
+
+	public ulong RegionHandle
+	{
+	    get { return m_regionHandle; }
+	}
+
         #endregion
 
         #region Constructor(s)
@@ -390,6 +396,16 @@ namespace OpenSim.Region.Environment.Scenes
             remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
         }
 
+        public void SendFullUpdateToALLClients()
+        {
+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
+            foreach (ScenePresence avatar in this.m_world.RequestAvatarList())
+            {
+                this.SendFullUpdateToOtherClient(avatar);
+                avatar.SendFullUpdateToOtherClient(this);
+            }
+        }
+
         /// <summary>
         /// 
         /// </summary>
@@ -410,6 +426,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void SendOurAppearance(IClientAPI OurClient)
         {
             this.ControllingClient.SendWearables(this.Wearables);
+            this.SendFullUpdateToALLClients();
             this.m_world.SendAllSceneObjectsToClient(this.ControllingClient);
         }
 
@@ -429,13 +446,13 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="seq"></param>
         public void SendAnimPack(LLUUID animID, int seq)
         {
-            this.current_anim = animID;
-            this.anim_seq = anim_seq;
-            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
-            for (int i = 0; i < avatars.Count; i++)
-            {
-                avatars[i].ControllingClient.SendAnimation(animID, seq, this.ControllingClient.AgentId);
-            }
+	    this.current_anim = animID;
+	    this.anim_seq = seq;
+	    List<ScenePresence> avatars = this.m_world.RequestAvatarList();
+	    for (int i = 0; i < avatars.Count; i++)
+	    {
+	    	avatars[i].ControllingClient.SendAnimation(animID, seq, this.ControllingClient.AgentId);
+	    }
         }
 
         /// <summary>
-- 
cgit v1.1