Merge branch 'master' into careminster-presence-refactor

2026-08-11 11:57:03 +08:00 · 2010-03-15 17:23:35 +00:00
parent 898fa637c3 1e73e16fd0
commit d3f33acc1a
89 changed files with 13161 additions and 3963 deletions
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            if (!m_Enabled)
                return;

-            lock(m_Scenes)
+            lock (m_Scenes)
            {
                m_Scenes.Remove(scene);
            }