diff options
author | Dan Lake | 2011-10-06 23:20:51 -0700 |
---|---|---|
committer | Dan Lake | 2011-10-06 23:20:51 -0700 |
commit | 4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb (patch) | |
tree | 19e2e008518286771e9e322aa2502db5c630cc62 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb.zip opensim-SC_OLD-4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb.tar.gz opensim-SC_OLD-4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb.tar.bz2 opensim-SC_OLD-4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb.tar.xz |
Fixed line endings from previous commit
Diffstat (limited to '')
-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 992e6c5..bcf668f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1109,7 +1109,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1109 | 1109 | ||
1110 | // Kick all ROOT agents with the message, 'The simulator is going down' | 1110 | // Kick all ROOT agents with the message, 'The simulator is going down' |
1111 | ForEachScenePresence(delegate(ScenePresence avatar) | 1111 | ForEachScenePresence(delegate(ScenePresence avatar) |
1112 | { | 1112 | { |
1113 | avatar.RemoveNeighbourRegion(RegionInfo.RegionHandle); | 1113 | avatar.RemoveNeighbourRegion(RegionInfo.RegionHandle); |
1114 | 1114 | ||
1115 | if (!avatar.IsChildAgent) | 1115 | if (!avatar.IsChildAgent) |
@@ -3102,7 +3102,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3102 | avatar.Scene.NeedSceneCacheClear(avatar.UUID); | 3102 | avatar.Scene.NeedSceneCacheClear(avatar.UUID); |
3103 | 3103 | ||
3104 | if (closeChildAgents && !avatar.IsChildAgent) | 3104 | if (closeChildAgents && !avatar.IsChildAgent) |
3105 | { | 3105 | { |
3106 | List<ulong> regions = avatar.KnownRegionHandles; | 3106 | List<ulong> regions = avatar.KnownRegionHandles; |
3107 | regions.Remove(RegionInfo.RegionHandle); | 3107 | regions.Remove(RegionInfo.RegionHandle); |
3108 | m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); | 3108 | m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); |