diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index 956b73a150..cf2e8534ac 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs @@ -48,11 +48,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule /// //private Dictionary m_rootAgents = new Dictionary(); - /// - /// Scenes by Region Handle - /// - private Dictionary m_scenel = new Dictionary(); - /// /// Startup /// @@ -64,26 +59,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule public void AddRegion(Scene scene) { - lock (m_scenel) - { - if (m_scenel.ContainsKey(scene.RegionInfo.RegionHandle)) - { - m_scenel[scene.RegionInfo.RegionHandle] = scene; - } - else - { - m_scenel.Add(scene.RegionInfo.RegionHandle, scene); - } - } - scene.EventManager.OnAvatarKilled += KillAvatar; } public void RemoveRegion(Scene scene) { - if (m_scenel.ContainsKey(scene.RegionInfo.RegionHandle)) - m_scenel.Remove(scene.RegionInfo.RegionHandle); - scene.EventManager.OnAvatarKilled -= KillAvatar; } @@ -109,12 +89,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule get { return null; } } - private void KillAvatar(uint killerObjectLocalID, ScenePresence deadAvatar) { string deadAvatarMessage; ScenePresence killingAvatar = null; -// string killingAvatarMessage; // check to see if it is an NPC and just remove it if(deadAvatar.IsNPC)