aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 79259d8..045e8d2 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -977,13 +977,13 @@ namespace OpenSim
977 /// Load the estate information for the provided RegionInfo object. 977 /// Load the estate information for the provided RegionInfo object.
978 /// </summary> 978 /// </summary>
979 /// <param name="regInfo"></param> 979 /// <param name="regInfo"></param>
980 public void PopulateRegionEstateInfo(RegionInfo regInfo) 980 public bool PopulateRegionEstateInfo(RegionInfo regInfo)
981 { 981 {
982 if (EstateDataService != null) 982 if (EstateDataService != null)
983 regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false); 983 regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false);
984 984
985 if (regInfo.EstateSettings.EstateID != 0) 985 if (regInfo.EstateSettings.EstateID != 0)
986 return; 986 return false; // estate info in the database did not change
987 987
988 m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName); 988 m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
989 989
@@ -1018,7 +1018,7 @@ namespace OpenSim
1018 } 1018 }
1019 1019
1020 if (defaultEstateJoined) 1020 if (defaultEstateJoined)
1021 return; 1021 return true; // need to update the database
1022 else 1022 else
1023 m_log.ErrorFormat( 1023 m_log.ErrorFormat(
1024 "[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName); 1024 "[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName);
@@ -1080,8 +1080,10 @@ namespace OpenSim
1080 MainConsole.Instance.Output("Joining the estate failed. Please try again."); 1080 MainConsole.Instance.Output("Joining the estate failed. Please try again.");
1081 } 1081 }
1082 } 1082 }
1083 } 1083 }
1084 } 1084
1085 return true; // need to update the database
1086 }
1085 } 1087 }
1086 1088
1087 public class OpenSimConfigSource 1089 public class OpenSimConfigSource