* 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.

3 files changed, 13 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
         }
 
         /// <summary>
-        /// Print the version information available to the library.  This include a subversion number if the root
-        /// .svn/entries file is present.
+        /// Update the version string with extra information if it's available.  
+        /// This currently means adding a subversion number if the root .svn/entries file is present.
         /// </summary>
-        protected void printAvailableVersionInformation()
+        protected void updateAvailableVersionInformation()
         {
             // Set BuildVersion String for Show version command
             string svnFileName = "../.svn/entries";
@@ -379,11 +379,7 @@ namespace OpenSim
 
             if (!string.IsNullOrEmpty(buildVersion))
             {
-                m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + ", SVN build r" + buildVersion + "\n");
-            }
-            else
-            {
-                m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
+                VersionInfo.Version += ", SVN build r" + buildVersion;
             }
         }
 
@@ -392,7 +388,8 @@ namespace OpenSim
         /// </summary>
         protected void InternalStartUp()
         {
-            printAvailableVersionInformation();
+            updateAvailableVersionInformation();
+            m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
 
             m_stats = StatsManager.StartCollectingSimExtraStats();
 
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 @@
 namespace OpenSim
 {
     /// <summary>
+    /// Exists purely to hold version information.
     /// </summary>
     public class VersionInfo
     {
-        public static string Version = "trunk (0.5.6 and additional code)";
+        public static string Version = "trunk (post 0.5.6)";
     }
 }
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;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenJPEGNet;
+using OpenSim;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
@@ -86,7 +87,7 @@ namespace OpenSim.Region.Environment.Scenes
         private int m_incrementsof15seconds = 0;
         private volatile bool m_backingup = false;
 
-        public string m_simulatorVersion = "OpenSimulator 0.5";
+        protected string m_simulatorVersion = VersionInfo.Version;
 
         protected ModuleLoader m_moduleLoader;
         protected StorageManager m_storageManager;
@@ -307,7 +308,9 @@ namespace OpenSim.Region.Environment.Scenes
                 OSString = OSString.Substring(0, 45);
             }
 
-            m_simulatorVersion = "OpenSimulator v0.5-SVN on " + OSString + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + " PhysPrim:" + m_physicalPrim.ToString();
+//            m_simulatorVersion += " on " + OSString 
+//                + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() 
+//                + " PhysPrim:" + m_physicalPrim.ToString();
         }
 
         #endregion