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/Region/Application/OpenSim.cs | |
| 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/Region/Application/OpenSim.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index e4bd857..daae3e6 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -618,10 +618,11 @@ namespace OpenSim | |||
| 618 | return; | 618 | return; |
| 619 | } | 619 | } |
| 620 | 620 | ||
| 621 | PopulateRegionEstateInfo(regInfo); | 621 | bool changed = PopulateRegionEstateInfo(regInfo); |
| 622 | IScene scene; | 622 | IScene scene; |
| 623 | CreateRegion(regInfo, true, out scene); | 623 | CreateRegion(regInfo, true, out scene); |
| 624 | regInfo.EstateSettings.Save(); | 624 | if (changed) |
| 625 | regInfo.EstateSettings.Save(); | ||
| 625 | } | 626 | } |
| 626 | 627 | ||
| 627 | /// <summary> | 628 | /// <summary> |