aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs15
-rw-r--r--OpenSim/Region/Application/VersionInfo.cs3
2 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7d09c07..a48b580 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -346,10 +346,10 @@ namespace OpenSim
346 } 346 }
347 347
348 /// <summary> 348 /// <summary>
349 /// Print the version information available to the library. This include a subversion number if the root 349 /// Update the version string with extra information if it's available.
350 /// .svn/entries file is present. 350 /// This currently means adding a subversion number if the root .svn/entries file is present.
351 /// </summary> 351 /// </summary>
352 protected void printAvailableVersionInformation() 352 protected void updateAvailableVersionInformation()
353 { 353 {
354 // Set BuildVersion String for Show version command 354 // Set BuildVersion String for Show version command
355 string svnFileName = "../.svn/entries"; 355 string svnFileName = "../.svn/entries";
@@ -379,11 +379,7 @@ namespace OpenSim
379 379
380 if (!string.IsNullOrEmpty(buildVersion)) 380 if (!string.IsNullOrEmpty(buildVersion))
381 { 381 {
382 m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + ", SVN build r" + buildVersion + "\n"); 382 VersionInfo.Version += ", SVN build r" + buildVersion;
383 }
384 else
385 {
386 m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
387 } 383 }
388 } 384 }
389 385
@@ -392,7 +388,8 @@ namespace OpenSim
392 /// </summary> 388 /// </summary>
393 protected void InternalStartUp() 389 protected void InternalStartUp()
394 { 390 {
395 printAvailableVersionInformation(); 391 updateAvailableVersionInformation();
392 m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
396 393
397 m_stats = StatsManager.StartCollectingSimExtraStats(); 394 m_stats = StatsManager.StartCollectingSimExtraStats();
398 395
diff --git a/OpenSim/Region/Application/VersionInfo.cs b/OpenSim/Region/Application/VersionInfo.cs
index f9146c5..430c413 100644
--- a/OpenSim/Region/Application/VersionInfo.cs
+++ b/OpenSim/Region/Application/VersionInfo.cs
@@ -28,9 +28,10 @@
28namespace OpenSim 28namespace OpenSim
29{ 29{
30 /// <summary> 30 /// <summary>
31 /// Exists purely to hold version information.
31 /// </summary> 32 /// </summary>
32 public class VersionInfo 33 public class VersionInfo
33 { 34 {
34 public static string Version = "trunk (0.5.6 and additional code)"; 35 public static string Version = "trunk (post 0.5.6)";
35 } 36 }
36} 37}