diff options
author | Melanie | 2011-10-12 07:05:47 +0100 |
---|---|---|
committer | Melanie | 2011-10-12 07:05:47 +0100 |
commit | 00285082d82a7a5b3d7a5e4f8f3ac6c56b431363 (patch) | |
tree | ed57db090dd909f59f11af628bed9ae0a0d85747 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge commit 'f26a966b8e79688ca2ed81c236492d694f34ac7d' into bigmerge (diff) | |
parent | Fixed line endings from previous commit (diff) | |
download | opensim-SC_OLD-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.zip opensim-SC_OLD-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.tar.gz opensim-SC_OLD-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.tar.bz2 opensim-SC_OLD-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.tar.xz |
Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index a432b6f..529dc9e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1135,7 +1135,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1135 | 1135 | ||
1136 | // Kick all ROOT agents with the message, 'The simulator is going down' | 1136 | // Kick all ROOT agents with the message, 'The simulator is going down' |
1137 | ForEachScenePresence(delegate(ScenePresence avatar) | 1137 | ForEachScenePresence(delegate(ScenePresence avatar) |
1138 | { | 1138 | { |
1139 | avatar.RemoveNeighbourRegion(RegionInfo.RegionHandle); | 1139 | avatar.RemoveNeighbourRegion(RegionInfo.RegionHandle); |
1140 | 1140 | ||
1141 | if (!avatar.IsChildAgent) | 1141 | if (!avatar.IsChildAgent) |
@@ -3224,7 +3224,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3224 | avatar.Scene.NeedSceneCacheClear(avatar.UUID); | 3224 | avatar.Scene.NeedSceneCacheClear(avatar.UUID); |
3225 | 3225 | ||
3226 | if (closeChildAgents && !avatar.IsChildAgent) | 3226 | if (closeChildAgents && !avatar.IsChildAgent) |
3227 | { | 3227 | { |
3228 | List<ulong> regions = avatar.KnownRegionHandles; | 3228 | List<ulong> regions = avatar.KnownRegionHandles; |
3229 | regions.Remove(RegionInfo.RegionHandle); | 3229 | regions.Remove(RegionInfo.RegionHandle); |
3230 | m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); | 3230 | m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); |