diff options
author | Justin Clark-Casey (justincc) | 2011-02-12 01:08:56 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-02-12 01:08:56 +0000 |
commit | 03d82a5a8524cfba07d95456d59be6f35ab72048 (patch) | |
tree | c0d85bd5990cbb126c276e3b0b369afcfe72f4ce /OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |
parent | Hack in a crude temporary "estate show" command (diff) | |
download | opensim-SC-03d82a5a8524cfba07d95456d59be6f35ab72048.zip opensim-SC-03d82a5a8524cfba07d95456d59be6f35ab72048.tar.gz opensim-SC-03d82a5a8524cfba07d95456d59be6f35ab72048.tar.bz2 opensim-SC-03d82a5a8524cfba07d95456d59be6f35ab72048.tar.xz |
Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.
Turns out we had stopped saving estate settings immediately after the name change. The scene constructor then reloade the settings and oblitereted the different name.
This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid.
Thanks to Thoneve for the spot on this.
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs')
-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; |