diff options
author | Melanie | 2013-04-16 22:37:47 +0100 |
---|---|---|
committer | Melanie | 2013-04-16 22:37:47 +0100 |
commit | d3f288e27b6298af557da7061be148c4d27b0651 (patch) | |
tree | ec11033f03830dd7a1a842e1064e981a7966cadd /OpenSim/Region/Application | |
parent | Merge branch 'master' into careminster (diff) | |
parent | refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing Sto... (diff) | |
download | opensim-SC_OLD-d3f288e27b6298af557da7061be148c4d27b0651.zip opensim-SC_OLD-d3f288e27b6298af557da7061be148c4d27b0651.tar.gz opensim-SC_OLD-d3f288e27b6298af557da7061be148c4d27b0651.tar.bz2 opensim-SC_OLD-d3f288e27b6298af557da7061be148c4d27b0651.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Application')
-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 7361f50..cd2338d 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -821,7 +821,7 @@ namespace OpenSim | |||
821 | 821 | ||
822 | if (foundClientServer) | 822 | if (foundClientServer) |
823 | { | 823 | { |
824 | m_clientServers[clientServerElement].NetworkStop(); | 824 | m_clientServers[clientServerElement].Stop(); |
825 | m_clientServers.RemoveAt(clientServerElement); | 825 | m_clientServers.RemoveAt(clientServerElement); |
826 | } | 826 | } |
827 | } | 827 | } |