aboutsummaryrefslogtreecommitdiffstatshomepage
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
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
-rw-r--r--OpenSim/Region/Application/VersionInfo.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs7
-rw-r--r--prebuild.xml1
4 files changed, 14 insertions, 12 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}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 250c884..a6042c3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -35,6 +35,7 @@ using Axiom.Math;
35using libsecondlife; 35using libsecondlife;
36using libsecondlife.Packets; 36using libsecondlife.Packets;
37using OpenJPEGNet; 37using OpenJPEGNet;
38using OpenSim;
38using OpenSim.Framework; 39using OpenSim.Framework;
39using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
@@ -86,7 +87,7 @@ namespace OpenSim.Region.Environment.Scenes
86 private int m_incrementsof15seconds = 0; 87 private int m_incrementsof15seconds = 0;
87 private volatile bool m_backingup = false; 88 private volatile bool m_backingup = false;
88 89
89 public string m_simulatorVersion = "OpenSimulator 0.5"; 90 protected string m_simulatorVersion = VersionInfo.Version;
90 91
91 protected ModuleLoader m_moduleLoader; 92 protected ModuleLoader m_moduleLoader;
92 protected StorageManager m_storageManager; 93 protected StorageManager m_storageManager;
@@ -307,7 +308,9 @@ namespace OpenSim.Region.Environment.Scenes
307 OSString = OSString.Substring(0, 45); 308 OSString = OSString.Substring(0, 45);
308 } 309 }
309 310
310 m_simulatorVersion = "OpenSimulator v0.5-SVN on " + OSString + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + " PhysPrim:" + m_physicalPrim.ToString(); 311// m_simulatorVersion += " on " + OSString
312// + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
313// + " PhysPrim:" + m_physicalPrim.ToString();
311 } 314 }
312 315
313 #endregion 316 #endregion
diff --git a/prebuild.xml b/prebuild.xml
index b2a2bd8..4ec31fb 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -763,6 +763,7 @@
763 <Reference name="System.Runtime.Remoting"/> 763 <Reference name="System.Runtime.Remoting"/>
764 <Reference name="libsecondlife.dll"/> 764 <Reference name="libsecondlife.dll"/>
765 <Reference name="Axiom.MathLib.dll"/> 765 <Reference name="Axiom.MathLib.dll"/>
766 <Reference name="OpenSim"/>
766 <Reference name="OpenSim.Framework"/> 767 <Reference name="OpenSim.Framework"/>
767 <Reference name="OpenSim.Data" /> 768 <Reference name="OpenSim.Data" />
768 <Reference name="OpenSim.Framework.Console"/> 769 <Reference name="OpenSim.Framework.Console"/>