diff options
| author | Melanie | 2012-01-31 20:53:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-31 20:53:49 +0000 |
| commit | 1b63b21a4db192cdfb24748be523dd53bbba47a9 (patch) | |
| tree | a9c45afd55fb652e35c9a703560c7e35af2cdfa6 /OpenSim/Region/Application | |
| parent | Make parcel sale overlays work. No auction support. (diff) | |
| parent | Remove scene object null check on SceneGraph.AddSceneObject(). Complain expl... (diff) | |
| download | opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.zip opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.gz opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.bz2 opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
Diffstat (limited to 'OpenSim/Region/Application')
| -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(); |