aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorJeff Ames2008-05-25 23:27:38 +0000
committerJeff Ames2008-05-25 23:27:38 +0000
commit5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch)
treeb010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Region/Application/OpenSimMain.cs
parent* A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff)
downloadopensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index cf12be7..dec0311 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -66,7 +66,7 @@ namespace OpenSim
66 /// The file used to load and save prim backup xml if none has been specified 66 /// The file used to load and save prim backup xml if none has been specified
67 /// </summary> 67 /// </summary>
68 protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; 68 protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml";
69 69
70 /// <summary> 70 /// <summary>
71 /// The file use to load and save an opensim archive if none has been specified 71 /// The file use to load and save an opensim archive if none has been specified
72 /// </summary> 72 /// </summary>
@@ -354,7 +354,7 @@ namespace OpenSim
354 } 354 }
355 355
356 /// <summary> 356 /// <summary>
357 /// Enhance the version string with extra information if it's available. 357 /// Enhance the version string with extra information if it's available.
358 /// </summary> 358 /// </summary>
359 protected void EnhanceVersionInformation() 359 protected void EnhanceVersionInformation()
360 { 360 {
@@ -387,7 +387,7 @@ namespace OpenSim
387 if (!string.IsNullOrEmpty(buildVersion)) 387 if (!string.IsNullOrEmpty(buildVersion))
388 { 388 {
389 VersionInfo.Version += ", SVN build r" + buildVersion; 389 VersionInfo.Version += ", SVN build r" + buildVersion;
390 } 390 }
391 else 391 else
392 { 392 {
393 VersionInfo.Version += ", SVN build revision not available"; 393 VersionInfo.Version += ", SVN build revision not available";
@@ -407,9 +407,9 @@ namespace OpenSim
407 if (OSString.Length > 45) 407 if (OSString.Length > 45)
408 { 408 {
409 OSString = OSString.Substring(0, 45); 409 OSString = OSString.Substring(0, 45);
410 } 410 }
411 411
412 VersionInfo.Version += ", OS " + OSString; 412 VersionInfo.Version += ", OS " + OSString;
413 } 413 }
414 414
415 /// <summary> 415 /// <summary>
@@ -418,7 +418,7 @@ namespace OpenSim
418 protected void InternalStartUp() 418 protected void InternalStartUp()
419 { 419 {
420 EnhanceVersionInformation(); 420 EnhanceVersionInformation();
421 421
422 m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n"); 422 m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
423 423
424 m_stats = StatsManager.StartCollectingSimExtraStats(); 424 m_stats = StatsManager.StartCollectingSimExtraStats();
@@ -710,7 +710,7 @@ namespace OpenSim
710 /// </summary> 710 /// </summary>
711 protected class SimStatusHandler : IStreamedRequestHandler 711 protected class SimStatusHandler : IStreamedRequestHandler
712 { 712 {
713 public byte[] Handle(string path, Stream request, 713 public byte[] Handle(string path, Stream request,
714 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 714 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
715 { 715 {
716 return Encoding.UTF8.GetBytes("OK"); 716 return Encoding.UTF8.GetBytes("OK");