aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to '')
-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 1652b82..e950613 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -795,9 +795,7 @@ namespace OpenSim
795 /// <summary> 795 /// <summary>
796 /// Load the estate information for the provided RegionInfo object. 796 /// Load the estate information for the provided RegionInfo object.
797 /// </summary> 797 /// </summary>
798 /// <param name="regInfo"> 798 /// <param name="regInfo"></param>
799 /// A <see cref="RegionInfo"/>
800 /// </param>
801 public void PopulateRegionEstateInfo(RegionInfo regInfo) 799 public void PopulateRegionEstateInfo(RegionInfo regInfo)
802 { 800 {
803 IEstateDataService estateDataService = EstateDataService; 801 IEstateDataService estateDataService = EstateDataService;
@@ -819,7 +817,13 @@ namespace OpenSim
819 regInfo.EstateSettings = estateDataService.LoadEstateSettings(regInfo.RegionID, true); 817 regInfo.EstateSettings = estateDataService.LoadEstateSettings(regInfo.RegionID, true);
820 818
821 regInfo.EstateSettings.EstateName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName); 819 regInfo.EstateSettings.EstateName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);
822 //regInfo.EstateSettings.Save(); 820
821 // FIXME: Later on, the scene constructor will reload the estate settings no matter what.
822 // Therefore, we need to do an initial save here otherwise the new estate name will be reset
823 // back to the default. The reloading of estate settings by scene could be eliminated if it
824 // knows that the passed in settings in RegionInfo are already valid. Also, it might be
825 // possible to eliminate some additional later saves made by callers of this method.
826 regInfo.EstateSettings.Save();
823 break; 827 break;
824 } 828 }
825 else 829 else