aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs15
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
2887 2887
2888 capsPaths[agent.AgentID] = agent.CapsPath; 2888 capsPaths[agent.AgentID] = agent.CapsPath;
2889 2889
2890 AddCapsHandler(agent.AgentID);
2891
2892 if (!agent.child) 2890 if (!agent.child)
2893 { 2891 {
2894 2892
2893 AddCapsHandler(agent.AgentID);
2894
2895 // Honor parcel landing type and position. 2895 // Honor parcel landing type and position.
2896 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); 2896 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
2897 if (land != null) 2897 if (land != null)
@@ -3108,18 +3108,7 @@ namespace OpenSim.Region.Environment.Scenes
3108 // } 3108 // }
3109 3109
3110 // Tell a single agent to disconnect from the region. 3110 // Tell a single agent to disconnect from the region.
3111 // This sends DisableSimulator over UDP, but that doesn't seem to be working
3112 // well with the latest LL viewer, so we're sending it also via the EQ
3113 presence.ControllingClient.SendShutdownConnectionNotice(); 3111 presence.ControllingClient.SendShutdownConnectionNotice();
3114 IEventQueue eq = RequestModuleInterface<IEventQueue>();
3115 if (eq != null)
3116 {
3117 OSD Item = EventQueueHelper.DisableSimulator(m_regInfo.RegionHandle);
3118 eq.Enqueue(Item, agentID);
3119 m_log.Debug("[Scene]: Enqueuing DisableSimulator for " + agentID + " in region " + m_regInfo.RegionName);
3120 Thread.Sleep(2000);
3121 }
3122 RemoveCapsHandler(agentID);
3123 3112
3124 presence.ControllingClient.Close(true); 3113 presence.ControllingClient.Close(true);
3125 } 3114 }