aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2011-02-16 02:41:49 +0000
committerMelanie2011-02-16 02:41:49 +0000
commitccd6e5d07146b8dd033bd1af09594834e87a883b (patch)
treee7ed9506d70d67c37ac8d40f9620cbaa24747305 /OpenSim/Region/Application
parentAdd the country functions in the careminster API (diff)
parentCatch HttpServer exception: mantis #5381 (diff)
downloadopensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.zip
opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.gz
opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.bz2
opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index b74a392..9960a54 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -877,9 +877,7 @@ namespace OpenSim
877 /// <summary> 877 /// <summary>
878 /// Load the estate information for the provided RegionInfo object. 878 /// Load the estate information for the provided RegionInfo object.
879 /// </summary> 879 /// </summary>
880 /// <param name="regInfo"> 880 /// <param name="regInfo"></param>
881 /// A <see cref="RegionInfo"/>
882 /// </param>
883 public void PopulateRegionEstateInfo(RegionInfo regInfo) 881 public void PopulateRegionEstateInfo(RegionInfo regInfo)
884 { 882 {
885 IEstateDataService estateDataService = EstateDataService; 883 IEstateDataService estateDataService = EstateDataService;
@@ -901,7 +899,13 @@ namespace OpenSim
901 regInfo.EstateSettings = estateDataService.LoadEstateSettings(regInfo.RegionID, true); 899 regInfo.EstateSettings = estateDataService.LoadEstateSettings(regInfo.RegionID, true);
902 900
903 regInfo.EstateSettings.EstateName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName); 901 regInfo.EstateSettings.EstateName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);
904 //regInfo.EstateSettings.Save(); 902
903 // FIXME: Later on, the scene constructor will reload the estate settings no matter what.
904 // Therefore, we need to do an initial save here otherwise the new estate name will be reset
905 // back to the default. The reloading of estate settings by scene could be eliminated if it
906 // knows that the passed in settings in RegionInfo are already valid. Also, it might be
907 // possible to eliminate some additional later saves made by callers of this method.
908 regInfo.EstateSettings.Save();
905 break; 909 break;
906 } 910 }
907 else 911 else