Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-04-16 22:37:47 +01:00
3 changed files with 14 additions and 8 deletions

View File

@@ -821,7 +821,7 @@ namespace OpenSim
if (foundClientServer)
{
m_clientServers[clientServerElement].NetworkStop();
m_clientServers[clientServerElement].Stop();
m_clientServers.RemoveAt(clientServerElement);
}
}