diff options
author | Justin Clark-Casey (justincc) | 2013-08-15 14:07:57 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-08-15 14:07:57 +0100 |
commit | 3f8d79024bc760e4f0c5cbca2126ab725c847078 (patch) | |
tree | c9e8bdb7464da618e446298f8556bdebf72bb9ee /OpenSim/Region/Framework | |
parent | Do not use the SP.DoNotCloseAfterTeleport flag for child agent connections. (diff) | |
download | opensim-SC-3f8d79024bc760e4f0c5cbca2126ab725c847078.zip opensim-SC-3f8d79024bc760e4f0c5cbca2126ab725c847078.tar.gz opensim-SC-3f8d79024bc760e4f0c5cbca2126ab725c847078.tar.bz2 opensim-SC-3f8d79024bc760e4f0c5cbca2126ab725c847078.tar.xz |
Rely on the Scene.IncomingCloseAgent() check as to whether the connection should be kept open after teleport-end rather than doing this in the ET Module
This is safer since the close check in IncomingCloseAgent() is done under lock conditions, which prevents a race between ETM and Scene.AddClient()
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 3e5ef10..b58e7c4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3725,7 +3725,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3725 | sp.DoNotCloseAfterTeleport = true; | 3725 | sp.DoNotCloseAfterTeleport = true; |
3726 | 3726 | ||
3727 | m_log.DebugFormat( | 3727 | m_log.DebugFormat( |
3728 | "[SCENE]: Set DoNotCloseAfterTeleport for child scene presence {0} in {1} because this region will attempt previous end-of-teleport close.", | 3728 | "[SCENE]: Set DoNotCloseAfterTeleport for child scene presence {0} in {1} because this region will attempt end-of-teleport close from a previous close.", |
3729 | sp.Name, Name); | 3729 | sp.Name, Name); |
3730 | } | 3730 | } |
3731 | } | 3731 | } |