diff options
| author | UbitUmarov | 2012-07-17 00:54:23 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-07-17 00:54:23 +0100 |
| commit | d5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch) | |
| tree | 8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |
| parent | UbitOde: remove useless water collider from active code. (diff) | |
| parent | Merge branch 'avination' into careminster (diff) | |
| download | opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2 opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
| -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 | { |