aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-21 16:55:03 +0000
committerTeravus Ovares2007-12-21 16:55:03 +0000
commita453672edb8169f9957e136ee8252e7391170721 (patch)
tree266e89502e0099dcadb0892b602e1afa397f837a /OpenSim/Region/Environment/Scenes
parentFixed that we weren't actually loading in some of the Library assets. Thanks ... (diff)
downloadopensim-SC_OLD-a453672edb8169f9957e136ee8252e7391170721.zip
opensim-SC_OLD-a453672edb8169f9957e136ee8252e7391170721.tar.gz
opensim-SC_OLD-a453672edb8169f9957e136ee8252e7391170721.tar.bz2
opensim-SC_OLD-a453672edb8169f9957e136ee8252e7391170721.tar.xz
* Remapped the Connection shutdown path.
* This fixes a *bunch* of Mantis bugs related to the following * -- Neighbouring simulators not appearing after relog * -- Login to simulator only to be logged off by simulator. * -- ThreadAbort * -- Unable to shutdown circuitCode: x
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 0cb353c..c4b409f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -478,7 +478,7 @@ namespace OpenSim.Region.Environment.Scenes
478 // Stop all client threads. 478 // Stop all client threads.
479 ForEachScenePresence(delegate(ScenePresence avatar) 479 ForEachScenePresence(delegate(ScenePresence avatar)
480 { 480 {
481 avatar.ControllingClient.Close(); 481 avatar.ControllingClient.Close(true);
482 }); 482 });
483 // Stop updating the scene objects and agents. 483 // Stop updating the scene objects and agents.
484 m_heartbeatTimer.Close(); 484 m_heartbeatTimer.Close();
@@ -1758,7 +1758,7 @@ namespace OpenSim.Region.Environment.Scenes
1758 bool childagent = !p.Equals(null) && p.IsChildAgent; 1758 bool childagent = !p.Equals(null) && p.IsChildAgent;
1759 if (controller.AgentId != godID && !childagent) // Do we really want to kick the initiator of this madness? 1759 if (controller.AgentId != godID && !childagent) // Do we really want to kick the initiator of this madness?
1760 { 1760 {
1761 controller.Close(); 1761 controller.Close(true);
1762 } 1762 }
1763 } 1763 }
1764 ); 1764 );
@@ -1775,7 +1775,7 @@ namespace OpenSim.Region.Environment.Scenes
1775 } 1775 }
1776 1776
1777 m_scenePresences[agentID].ControllingClient.Kick(Helpers.FieldToUTF8String(reason)); 1777 m_scenePresences[agentID].ControllingClient.Kick(Helpers.FieldToUTF8String(reason));
1778 m_scenePresences[agentID].ControllingClient.Close(); 1778 m_scenePresences[agentID].ControllingClient.Close(true);
1779 } 1779 }
1780 } 1780 }
1781 else 1781 else