ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source 
Resolve merge conflicts

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
This commit is contained in:
Justin Clark-Casey (justincc)
2010-08-26 00:35:03 +01:00
parent 692cf3c657 75e2a2b3ce
commit 87a6554d4b
3 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -3164,7 +3164,6 @@ namespace OpenSim.Region.Framework.Scenes
}
m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode);
//m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
//m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
}