From de6ad380f659edbc102e9bde01033acd19034c2d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Aug 2013 19:31:45 +0100
Subject: Get rid of issue where removing NPCs would through an exception by
 routing close through Scene.IncomingCloseAgent() and NPCAvatar.Close() rather
 than directly to Scene.RemoveClient().

This exception was actually harmless since it occurred at the very last stage of the remove client process.
---
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/OptionalModules')

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 69189b3..c26fdfc 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -385,7 +385,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove",
                             agentID, av.Name);
                     */
-                    scene.RemoveClient(agentID, false);
+
+                    scene.IncomingCloseAgent(agentID, false);
+//                    scene.RemoveClient(agentID, false);
                     m_avatars.Remove(agentID);
                     /*
                     m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}",
-- 
cgit v1.1


From 377fe63c60b6632777da5f0a8a0c4c2d32a1f4ac Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Aug 2013 21:02:50 +0100
Subject: Don't try and send group updates to NPCs via event queue, since NPCs
 have no event queue.

I think there is an argument for sending this information to NPCs anyway since in some cases it appears a lot easier to write server-side bots by hooking into such internal events.
However, would need to stop event messages building up on NPC queues if they are never retrieved.
---
 OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/Region/OptionalModules')

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index f4734b7..d744a14 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1212,7 +1212,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             AgentDataMap.Add("AgentID", OSD.FromUUID(dataForAgentID));
             AgentData.Add(AgentDataMap);
 
-
             OSDArray GroupData = new OSDArray(data.Length);
             OSDArray NewGroupData = new OSDArray(data.Length);
 
-- 
cgit v1.1