Applying diva's revert patch. Reverts closing child agents and makes

TP more reliable again.

1 files changed, 2 insertions, 13 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3d21820..bef79f8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2887,11 +2887,11 @@ namespace OpenSim.Region.Environment.Scenes
 
             capsPaths[agent.AgentID] = agent.CapsPath;
 
-            AddCapsHandler(agent.AgentID);
-
             if (!agent.child)
             {
 
+                AddCapsHandler(agent.AgentID);
+
                 // Honor parcel landing type and position.
                 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
                 if (land != null)
@@ -3108,18 +3108,7 @@ namespace OpenSim.Region.Environment.Scenes
                 // }
 
                 // Tell a single agent to disconnect from the region.
-                // This sends DisableSimulator over UDP, but that doesn't seem to be working
-                // well with the latest LL viewer, so we're sending it also via the EQ
                 presence.ControllingClient.SendShutdownConnectionNotice();
-                IEventQueue eq = RequestModuleInterface<IEventQueue>();
-                if (eq != null)
-                {
-                    OSD Item = EventQueueHelper.DisableSimulator(m_regInfo.RegionHandle);
-                    eq.Enqueue(Item, agentID);
-                    m_log.Debug("[Scene]: Enqueuing DisableSimulator for " + agentID + " in region " + m_regInfo.RegionName);
-                    Thread.Sleep(2000);
-                }
-                RemoveCapsHandler(agentID);
 
                 presence.ControllingClient.Close(true);
             }