diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 3fafaf4..a4f5028 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -82,6 +82,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
82 | private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing | 82 | private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing |
83 | private int m_incrementsof15seconds = 0; | 83 | private int m_incrementsof15seconds = 0; |
84 | 84 | ||
85 | public string m_simulatorVersion = "OpenSimulator 0.5"; | ||
86 | |||
85 | protected ModuleLoader m_moduleLoader; | 87 | protected ModuleLoader m_moduleLoader; |
86 | protected StorageManager m_storageManager; | 88 | protected StorageManager m_storageManager; |
87 | protected AgentCircuitManager m_authenticateHandler; | 89 | protected AgentCircuitManager m_authenticateHandler; |
@@ -300,6 +302,22 @@ namespace OpenSim.Region.Environment.Scenes | |||
300 | 302 | ||
301 | m_statsReporter = new SimStatsReporter(regInfo); | 303 | m_statsReporter = new SimStatsReporter(regInfo); |
302 | m_statsReporter.OnSendStatsResult += SendSimStatsPackets; | 304 | m_statsReporter.OnSendStatsResult += SendSimStatsPackets; |
305 | string OSString = ""; | ||
306 | |||
307 | if (System.Environment.OSVersion.Platform != PlatformID.Unix) | ||
308 | { | ||
309 | OSString = System.Environment.OSVersion.ToString(); | ||
310 | } | ||
311 | else | ||
312 | { | ||
313 | OSString = Util.ReadEtcIssue(); | ||
314 | } | ||
315 | if (OSString.Length > 45) | ||
316 | { | ||
317 | OSString = OSString.Substring(0,45); | ||
318 | } | ||
319 | |||
320 | m_simulatorVersion = "OpenSimulator v0.5-SVN on " + OSString + " ChilTasks:" + m_sendTasksToChild.ToString() + " PhysPrim:" + m_physicalPrim.ToString(); | ||
303 | } | 321 | } |
304 | 322 | ||
305 | #endregion | 323 | #endregion |
@@ -313,6 +331,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
313 | m_eventManager.OnPermissionError += SendPermissionAlert; | 331 | m_eventManager.OnPermissionError += SendPermissionAlert; |
314 | } | 332 | } |
315 | 333 | ||
334 | public override string GetSimulatorVersion() | ||
335 | { | ||
336 | return m_simulatorVersion; | ||
337 | } | ||
338 | |||
316 | public override bool OtherRegionUp(RegionInfo otherRegion) | 339 | public override bool OtherRegionUp(RegionInfo otherRegion) |
317 | { | 340 | { |
318 | // Another region is up. | 341 | // Another region is up. |