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/OpenSimBase.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/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index a0c9a0a..0adb693 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -1060,13 +1060,13 @@ namespace OpenSim | |||
1060 | /// Load the estate information for the provided RegionInfo object. | 1060 | /// Load the estate information for the provided RegionInfo object. |
1061 | /// </summary> | 1061 | /// </summary> |
1062 | /// <param name="regInfo"></param> | 1062 | /// <param name="regInfo"></param> |
1063 | public void PopulateRegionEstateInfo(RegionInfo regInfo) | 1063 | public bool PopulateRegionEstateInfo(RegionInfo regInfo) |
1064 | { | 1064 | { |
1065 | if (EstateDataService != null) | 1065 | if (EstateDataService != null) |
1066 | regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false); | 1066 | regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false); |
1067 | 1067 | ||
1068 | if (regInfo.EstateSettings.EstateID != 0) | 1068 | if (regInfo.EstateSettings.EstateID != 0) |
1069 | return; | 1069 | return false; // estate info in the database did not change |
1070 | 1070 | ||
1071 | m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName); | 1071 | m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName); |
1072 | 1072 | ||
@@ -1101,7 +1101,7 @@ namespace OpenSim | |||
1101 | } | 1101 | } |
1102 | 1102 | ||
1103 | if (defaultEstateJoined) | 1103 | if (defaultEstateJoined) |
1104 | return; | 1104 | return true; // need to update the database |
1105 | else | 1105 | else |
1106 | m_log.ErrorFormat( | 1106 | m_log.ErrorFormat( |
1107 | "[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName); | 1107 | "[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName); |
@@ -1163,8 +1163,10 @@ namespace OpenSim | |||
1163 | MainConsole.Instance.Output("Joining the estate failed. Please try again."); | 1163 | MainConsole.Instance.Output("Joining the estate failed. Please try again."); |
1164 | } | 1164 | } |
1165 | } | 1165 | } |
1166 | } | 1166 | } |
1167 | } | 1167 | |
1168 | return true; // need to update the database | ||
1169 | } | ||
1168 | } | 1170 | } |
1169 | 1171 | ||
1170 | public class OpenSimConfigSource | 1172 | public class OpenSimConfigSource |