Update version number stuff, and hack it into the money display.

3 files changed, 26 insertions, 6 deletions

diff --git a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
index 68a1c78..2d72cb8 100644
--- a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
+++ b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
@@ -41,5 +41,14 @@ namespace OpenSim.Framework.Servers.Tests
         {
             Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars.");
         }
+
+        [Test]
+        public void TestGetVersionStringLength()
+        {
+            foreach (VersionInfo.Flavour flavour in Enum.GetValues(typeof(VersionInfo.Flavour)))
+            {
+                Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.GetVersionString("0.0.0", "0", flavour).Length, "0.0.0/" + flavour + " failed");
+            }
+        }
     }
 }
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
index 7e78d24..3ae5145 100644
--- a/OpenSim/Framework/VersionInfo.cs
+++ b/OpenSim/Framework/VersionInfo.cs
@@ -31,6 +31,7 @@ namespace OpenSim
     {
         public const string VersionNumber = "0.9.1.1";
         public const string AssemblyVersionNumber = "0.9.1.1";
+        public const string SC_BUILD_NUMBER = "0";
 
         public const Flavour VERSION_FLAVOUR = Flavour.Release;
 
@@ -38,6 +39,7 @@ namespace OpenSim
         {
             Unknown,
             Dev,
+            RC0,
             RC1,
             RC2,
             RC3,
@@ -48,16 +50,16 @@ namespace OpenSim
 
         public static string Version
         {
-            get { return GetVersionString(VersionNumber, VERSION_FLAVOUR); }
+            get { return GetVersionString(VersionNumber, SC_BUILD_NUMBER, VERSION_FLAVOUR); }
         }
 
-        public static string GetVersionString(string versionNumber, Flavour flavour)
+        public static string GetVersionString(string versionNumber, string buildNumber, Flavour flavour)
         {
-            string versionString = "OpenSim " + versionNumber + " Snail " + flavour;
+            string versionString = "opensim-SC " + versionNumber + " " + flavour + " build " + buildNumber;
             return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
         }
 
-        public const int VERSIONINFO_VERSION_LENGTH = 29;
+        public const int VERSIONINFO_VERSION_LENGTH = 39;
 
         /// <value>
         /// This is the external interface version.  It is separate from the OpenSimulator project version.
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index b32a429..f378921 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -573,9 +573,18 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <returns></returns>
         private int GetFundsForAgentID(UUID AgentID)
         {
-            int returnfunds = 0;
+            int result = 0;
+            // Set it to the OpenSim version, plus the SC build number.  Muahahaha;
+            string v = VersionInfo.VersionNumber + VersionInfo.SC_BUILD_NUMBER.PadLeft(3, '0');
+            try
+            {
+                result = Int32.Parse(v.Replace(".", ""));
+            }
+            catch (FormatException)
+            {
+            }
 
-            return returnfunds;
+            return result;
         }
 
         // private void SetLocalFundsForAgentID(UUID AgentID, int amount)