diff options
| author | Melanie | 2009-10-08 10:32:15 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-08 10:32:15 +0100 |
| commit | f6b8bac0fab3dfc3d25775e51bb89ee10feebb53 (patch) | |
| tree | de16f4c7c14fce6851a4cd9c80117d1cbdd4b38e /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Correct a build break caused by an optimization in trunk (diff) | |
| parent | Remove ThreadTrackerTest. It's no longer relevant because the thread (diff) | |
| download | opensim-SC-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.zip opensim-SC-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.gz opensim-SC-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.bz2 opensim-SC-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 6e7a2a0..4592c31 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -675,7 +675,7 @@ namespace OpenSim | |||
| 675 | 675 | ||
| 676 | if (foundClientServer) | 676 | if (foundClientServer) |
| 677 | { | 677 | { |
| 678 | m_clientServers[clientServerElement].Server.Close(); | 678 | m_clientServers[clientServerElement].NetworkStop(); |
| 679 | m_clientServers.RemoveAt(clientServerElement); | 679 | m_clientServers.RemoveAt(clientServerElement); |
| 680 | } | 680 | } |
| 681 | IScene scene; | 681 | IScene scene; |