diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 6e26c0e..80bff17 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -439,6 +439,7 @@ namespace OpenSim | |||
439 | { | 439 | { |
440 | scene.SnmpService.BootInfo("Grid Registration in progress", scene); | 440 | scene.SnmpService.BootInfo("Grid Registration in progress", scene); |
441 | } | 441 | } |
442 | |||
442 | try | 443 | try |
443 | { | 444 | { |
444 | scene.RegisterRegionWithGrid(); | 445 | scene.RegisterRegionWithGrid(); |