aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
diff options
context:
space:
mode:
authormeta72010-08-18 02:53:27 -0700
committermeta72010-08-18 02:53:27 -0700
commitca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch)
tree2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
parentFix a nullref exception in the prioritizer (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip
opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz
opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2
opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 1e85a22..b16f46c 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -122,7 +122,9 @@ 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 m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
125 m_openSim.CreateRegion(regionsToLoad[i], true, out scene); 126 m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
127 regionsToLoad[i].EstateSettings.Save();
126 if (scene != null) 128 if (scene != null)
127 { 129 {
128 m_newRegionCreatedHandler = OnNewRegionCreated; 130 m_newRegionCreatedHandler = OnNewRegionCreated;