Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Application/OpenSimBase.cs
2026-08-08 18:25:33 +08:00 · 2012-01-31 20:53:49 +00:00
parent 71012ef883 10b9348071
commit 1b63b21a4d
8 changed files with 227 additions and 5 deletions
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -439,6 +439,7 @@ namespace OpenSim
            {
                scene.SnmpService.BootInfo("Grid Registration in progress", scene);
            } 
+
            try
            {
                scene.RegisterRegionWithGrid();