diff options
| author | Melanie | 2011-02-16 02:41:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-16 02:41:49 +0000 |
| commit | ccd6e5d07146b8dd033bd1af09594834e87a883b (patch) | |
| tree | e7ed9506d70d67c37ac8d40f9620cbaa24747305 /OpenSim/ApplicationPlugins | |
| parent | Add the country functions in the careminster API (diff) | |
| parent | Catch HttpServer exception: mantis #5381 (diff) | |
| download | opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.zip opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.gz opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.bz2 opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 7ef0f5f..f37c399 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
| @@ -122,9 +122,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
| 122 | m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + | 122 | m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + |
| 123 | Thread.CurrentThread.ManagedThreadId.ToString() + | 123 | Thread.CurrentThread.ManagedThreadId.ToString() + |
| 124 | ")"); | 124 | ")"); |
| 125 | |||
| 125 | m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]); | 126 | m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]); |
| 126 | m_openSim.CreateRegion(regionsToLoad[i], true, out scene); | 127 | m_openSim.CreateRegion(regionsToLoad[i], true, out scene); |
| 127 | regionsToLoad[i].EstateSettings.Save(); | 128 | regionsToLoad[i].EstateSettings.Save(); |
| 129 | |||
| 128 | if (scene != null) | 130 | if (scene != null) |
| 129 | { | 131 | { |
| 130 | m_newRegionCreatedHandler = OnNewRegionCreated; | 132 | m_newRegionCreatedHandler = OnNewRegionCreated; |