Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2016-12-30 01:52:02 +00:00
23 changed files with 271 additions and 62 deletions

View File

@@ -621,7 +621,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
GroupsInView.Clear();
if(m_scene.GetNumberOfClients() == 0)
GC.Collect();
{
GC.Collect();
GC.WaitForPendingFinalizers();
GC.Collect();
}
}
public void Kick(string message)