1 files changed, 16 insertions, 2 deletions

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 445df1d..e89f8f4 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -561,11 +561,25 @@ namespace OpenSim.world
                 }

                 lock (Entities)

                 {

-                    this.Entities.Add(agentClient.AgentID, newAvatar);

+                    if (!Entities.ContainsKey(agentClient.AgentID))

+                    {

+                        this.Entities.Add(agentClient.AgentID, newAvatar);

+                    }

+                    else

+                    {

+                        Entities[agentClient.AgentID] = newAvatar;

+                    }

                 }

                 lock (Avatars)

                 {

-                    this.Avatars.Add(agentClient.AgentID, newAvatar);

+                    if (Avatars.ContainsKey(agentClient.AgentID))

+                    {

+                        Avatars[agentClient.AgentID] = newAvatar;

+                    }

+                    else

+                    {

+                        this.Avatars.Add(agentClient.AgentID, newAvatar);

+                    }

                 }

             }

             catch (Exception e)