diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index ddc7f10..76ac246 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -232,7 +232,7 @@ namespace OpenSim | |||
232 | 232 | ||
233 | base.StartupSpecific(); | 233 | base.StartupSpecific(); |
234 | 234 | ||
235 | m_stats = StatsManager.StartCollectingSimExtraStats(); | 235 | m_stats = StatsManager.SimExtraStats; |
236 | 236 | ||
237 | // Create a ModuleLoader instance | 237 | // Create a ModuleLoader instance |
238 | m_moduleLoader = new ModuleLoader(m_config.Source); | 238 | m_moduleLoader = new ModuleLoader(m_config.Source); |
@@ -437,7 +437,7 @@ namespace OpenSim | |||
437 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); | 437 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); |
438 | 438 | ||
439 | // TODO : Try setting resource for region xstats here on scene | 439 | // TODO : Try setting resource for region xstats here on scene |
440 | MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); | 440 | MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo)); |
441 | 441 | ||
442 | scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); | 442 | scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); |
443 | scene.EventManager.TriggerParcelPrimCountUpdate(); | 443 | scene.EventManager.TriggerParcelPrimCountUpdate(); |
@@ -856,6 +856,9 @@ namespace OpenSim | |||
856 | return Util.UTF8.GetBytes("OK"); | 856 | return Util.UTF8.GetBytes("OK"); |
857 | } | 857 | } |
858 | 858 | ||
859 | public string Name { get { return "SimStatus"; } } | ||
860 | public string Description { get { return "Simulator Status"; } } | ||
861 | |||
859 | public string ContentType | 862 | public string ContentType |
860 | { | 863 | { |
861 | get { return "text/plain"; } | 864 | get { return "text/plain"; } |
@@ -880,6 +883,9 @@ namespace OpenSim | |||
880 | { | 883 | { |
881 | OpenSimBase m_opensim; | 884 | OpenSimBase m_opensim; |
882 | string osXStatsURI = String.Empty; | 885 | string osXStatsURI = String.Empty; |
886 | |||
887 | public string Name { get { return "XSimStatus"; } } | ||
888 | public string Description { get { return "Simulator XStatus"; } } | ||
883 | 889 | ||
884 | public XSimStatusHandler(OpenSimBase sim) | 890 | public XSimStatusHandler(OpenSimBase sim) |
885 | { | 891 | { |
@@ -920,6 +926,9 @@ namespace OpenSim | |||
920 | { | 926 | { |
921 | OpenSimBase m_opensim; | 927 | OpenSimBase m_opensim; |
922 | string osUXStatsURI = String.Empty; | 928 | string osUXStatsURI = String.Empty; |
929 | |||
930 | public string Name { get { return "UXSimStatus"; } } | ||
931 | public string Description { get { return "Simulator UXStatus"; } } | ||
923 | 932 | ||
924 | public UXSimStatusHandler(OpenSimBase sim) | 933 | public UXSimStatusHandler(OpenSimBase sim) |
925 | { | 934 | { |
@@ -1051,13 +1060,13 @@ namespace OpenSim | |||
1051 | /// Load the estate information for the provided RegionInfo object. | 1060 | /// Load the estate information for the provided RegionInfo object. |
1052 | /// </summary> | 1061 | /// </summary> |
1053 | /// <param name="regInfo"></param> | 1062 | /// <param name="regInfo"></param> |
1054 | public void PopulateRegionEstateInfo(RegionInfo regInfo) | 1063 | public bool PopulateRegionEstateInfo(RegionInfo regInfo) |
1055 | { | 1064 | { |
1056 | if (EstateDataService != null) | 1065 | if (EstateDataService != null) |
1057 | regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false); | 1066 | regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false); |
1058 | 1067 | ||
1059 | if (regInfo.EstateSettings.EstateID != 0) | 1068 | if (regInfo.EstateSettings.EstateID != 0) |
1060 | return; | 1069 | return false; // estate info in the database did not change |
1061 | 1070 | ||
1062 | 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); |
1063 | 1072 | ||
@@ -1092,7 +1101,7 @@ namespace OpenSim | |||
1092 | } | 1101 | } |
1093 | 1102 | ||
1094 | if (defaultEstateJoined) | 1103 | if (defaultEstateJoined) |
1095 | return; | 1104 | return true; // need to update the database |
1096 | else | 1105 | else |
1097 | m_log.ErrorFormat( | 1106 | m_log.ErrorFormat( |
1098 | "[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName); | 1107 | "[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName); |
@@ -1154,8 +1163,10 @@ namespace OpenSim | |||
1154 | MainConsole.Instance.Output("Joining the estate failed. Please try again."); | 1163 | MainConsole.Instance.Output("Joining the estate failed. Please try again."); |
1155 | } | 1164 | } |
1156 | } | 1165 | } |
1157 | } | 1166 | } |
1158 | } | 1167 | |
1168 | return true; // need to update the database | ||
1169 | } | ||
1159 | } | 1170 | } |
1160 | 1171 | ||
1161 | public class OpenSimConfigSource | 1172 | public class OpenSimConfigSource |