aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-21 23:52:02 +0000
committerJustin Clarke Casey2008-05-21 23:52:02 +0000
commit9263f07d7017a34edbea07a8f39c8936b4690f66 (patch)
tree4927c4860c605260be8622bbbcab84554b2f0fb9 /OpenSim/Region/Application/OpenSimMain.cs
parent* Deprecate load-xml and save-xml in favour of load-xml2/save-xml2. (diff)
downloadopensim-SC_OLD-9263f07d7017a34edbea07a8f39c8936b4690f66.zip
opensim-SC_OLD-9263f07d7017a34edbea07a8f39c8936b4690f66.tar.gz
opensim-SC_OLD-9263f07d7017a34edbea07a8f39c8936b4690f66.tar.bz2
opensim-SC_OLD-9263f07d7017a34edbea07a8f39c8936b4690f66.tar.xz
* Send VersionInfo string instead of the hardcoded Scene string to the "About Second Life" box
* This is the same string as printed out on the opensim region console at startup, so it should now include the svn revision number (if available) * This dialog box takes an awful long time to come up on my local system - no idea why that is. However, that also seems to have been the case before this revision.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs15
1 files changed, 6 insertions, 9 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