diff options
| author | Justin Clark-Casey (justincc) | 2010-08-26 00:35:03 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-26 00:35:03 +0100 |
| commit | 87a6554d4b10ebde08de91e10d050a2c7343b865 (patch) | |
| tree | beb5333563ee8d0ff0604b0c7879eb7350193c61 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Remove parts locking from data classes since these are using a copy of the sc... (diff) | |
| parent | Prevent an object disposed exception that made forms comms unreliable. After (diff) | |
| download | opensim-SC_OLD-87a6554d4b10ebde08de91e10d050a2c7343b865.zip opensim-SC_OLD-87a6554d4b10ebde08de91e10d050a2c7343b865.tar.gz opensim-SC_OLD-87a6554d4b10ebde08de91e10d050a2c7343b865.tar.bz2 opensim-SC_OLD-87a6554d4b10ebde08de91e10d050a2c7343b865.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Resolve merge conflicts
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 8556105..1f4d022 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3164,7 +3164,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3164 | } | 3164 | } |
| 3165 | 3165 | ||
| 3166 | m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); | 3166 | m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); |
| 3167 | |||
| 3168 | //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); | 3167 | //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); |
| 3169 | //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); | 3168 | //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); |
| 3170 | } | 3169 | } |