diff options
| author | Melanie | 2012-05-10 20:33:27 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-10 20:33:27 +0100 |
| commit | 8558a36506036c39d6a18556acc4a40f28fb6f9f (patch) | |
| tree | e8a35d22e2c8fcc94cefc84967d6a7c316865182 /OpenSim/ApplicationPlugins | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Saving estate state is really slow (relatively) and it gets (diff) | |
| download | opensim-SC_OLD-8558a36506036c39d6a18556acc4a40f28fb6f9f.zip opensim-SC_OLD-8558a36506036c39d6a18556acc4a40f28fb6f9f.tar.gz opensim-SC_OLD-8558a36506036c39d6a18556acc4a40f28fb6f9f.tar.bz2 opensim-SC_OLD-8558a36506036c39d6a18556acc4a40f28fb6f9f.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 45b8d6f..0065702 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
| @@ -122,9 +122,10 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
| 122 | Thread.CurrentThread.ManagedThreadId.ToString() + | 122 | Thread.CurrentThread.ManagedThreadId.ToString() + |
| 123 | ")"); | 123 | ")"); |
| 124 | 124 | ||
| 125 | m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]); | 125 | bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]); |
| 126 | m_openSim.CreateRegion(regionsToLoad[i], true, out scene); | 126 | m_openSim.CreateRegion(regionsToLoad[i], true, out scene); |
| 127 | regionsToLoad[i].EstateSettings.Save(); | 127 | if (changed) |
| 128 | regionsToLoad[i].EstateSettings.Save(); | ||
| 128 | 129 | ||
| 129 | if (scene != null) | 130 | if (scene != null) |
| 130 | { | 131 | { |