From d8aaf2ccf11f67277544c5d72ed7dadd63e93ae2 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Wed, 7 May 2008 23:59:57 +0000
Subject: [PATCH] * For no good reason (since there are a hundred million other
 things to fix), change formatting of version information printed to the log *
 Push printing down into OpenSimMain so both console and consoleless
 configurations will get it

---
 OpenSim/Region/Application/OpenSimMain.cs     | 49 +++++++++++++++++++
 .../Region/Application/OpenSimMainConsole.cs  | 37 +-------------
 OpenSim/Region/Application/VersionInfo.cs     |  2 +-
 3 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index f704dd2499..735f662209 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -53,6 +53,11 @@ namespace OpenSim
     {        
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Holds a human readable build version for this server.
+        /// </summary>
+        protected string buildVersion;
+        
         protected string proxyUrl;
         protected int proxyOffset = 0;
 
@@ -337,12 +342,56 @@ namespace OpenSim
         {
             WorldHasComeToAnEnd.Set();
         }
+        
+        /// <summary>
+        /// Print the version information available to the library.  This include a subversion number if the root
+        /// .svn/entries file is present.
+        /// </summary>
+        protected void printAvailableVersionInformation()
+        {
+            // Set BuildVersion String for Show version command
+            string svnFileName = "../.svn/entries";
+            string inputLine = null;
+            int strcmp;
+
+            if (File.Exists(svnFileName))
+            {
+                StreamReader EntriesFile = File.OpenText(svnFileName);
+                inputLine = EntriesFile.ReadLine();
+                while (inputLine != null)
+                {
+                    // using the dir svn revision at the top of entries file
+                    strcmp = String.Compare(inputLine, "dir");
+                    if (strcmp == 0)
+                    {
+                        buildVersion = EntriesFile.ReadLine();
+                        break;
+                    }
+                    else
+                    {
+                        inputLine = EntriesFile.ReadLine();
+                    }
+                }
+                EntriesFile.Close();
+            }
+
+            if ((buildVersion != null) && (buildVersion.Length > 0))
+            {
+                m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + ", SVN build r" + buildVersion + "\n");
+            }
+            else
+            {
+                m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
+            }
+        }
 
         /// <summary>
         /// Performs initialisation of the scene, such as loading configuration from disk.
         /// </summary>
         protected void InternalStartUp()
         {
+            printAvailableVersionInformation();
+            
             StatsManager.StartCollectingSimExtraStats();
             
             // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs
index ab835ba82d..26532738bf 100644
--- a/OpenSim/Region/Application/OpenSimMainConsole.cs
+++ b/OpenSim/Region/Application/OpenSimMainConsole.cs
@@ -55,7 +55,6 @@ namespace OpenSim
 
         private string m_timedScript = "disabled";
         private Timer m_scriptTimer;
-        private string buildVersion = null;
 
         public OpenSimMainConsole(IConfigSource configSource)
             : base(configSource)
@@ -112,42 +111,8 @@ namespace OpenSim
                 m_scriptTimer.Interval = 1200 * 1000;
                 m_scriptTimer.Elapsed += RunAutoTimerScript;
             }
+            
             PrintFileToConsole("startuplogo.txt");
-
-            // Set BuildVersion String for Show version command
-            string svnFileName = "../.svn/entries";
-            string inputLine = null;
-            int strcmp;
-
-            if (File.Exists(svnFileName))
-            {
-                StreamReader EntriesFile = File.OpenText(svnFileName);
-                inputLine = EntriesFile.ReadLine();
-                while (inputLine != null)
-                {
-                    // using the dir svn revision at the top of entries file
-                    strcmp = String.Compare(inputLine, "dir");
-                    if (strcmp == 0)
-                    {
-                        buildVersion = EntriesFile.ReadLine();
-                        break;
-                    }
-                    else
-                    {
-                        inputLine = EntriesFile.ReadLine();
-                    }
-                }
-                EntriesFile.Close();
-            }
-
-            if ((buildVersion != null) && (buildVersion.Length > 0))
-            {
-                m_log.Info("OpenSim " + VersionInfo.Version + " r" + buildVersion + "\n");
-            }
-            else
-            {
-                m_log.Info("OpenSim " + VersionInfo.Version + "\n");
-            }
         }
 
         protected ConsoleBase CreateConsole()
diff --git a/OpenSim/Region/Application/VersionInfo.cs b/OpenSim/Region/Application/VersionInfo.cs
index 6e0d30bb73..f9146c5ba3 100644
--- a/OpenSim/Region/Application/VersionInfo.cs
+++ b/OpenSim/Region/Application/VersionInfo.cs
@@ -31,6 +31,6 @@ namespace OpenSim
     /// </summary>
     public class VersionInfo
     {
-        public static string Version = "0.5, SVN build ";
+        public static string Version = "trunk (0.5.6 and additional code)";
     }
 }