Merge branch 'master' into presence-refactor

This brings presence-refactor up to master again
2026-08-09 02:36:00 +08:00 · 2010-02-22 03:00:59 +00:00
parent 2e7aa387f7 2dea162073
commit 1f45e6c649
39 changed files with 405 additions and 5161 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// Returns a new unallocated local ID
        /// </summary>
        /// <returns>A brand new local ID</returns>
-        protected internal uint AllocateLocalId()
+        public uint AllocateLocalId()
        {
            uint myID;