From 98a6a502003c01b2ff6ae86ee728dd373e15463f Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 24 Feb 2013 00:08:18 +1000
Subject: Rejig version number.

---
 OpenSim/Framework/Servers/Tests/VersionInfoTests.cs        |  2 +-
 OpenSim/Framework/Servers/VersionInfo.cs                   | 14 +++++++-------
 .../OptionalModules/World/MoneyModule/SampleMoneyModule.cs |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
index 2a59ee3..2d72cb8 100644
--- a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
+++ b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers.Tests
         {
             foreach (VersionInfo.Flavour flavour in Enum.GetValues(typeof(VersionInfo.Flavour)))
             {
-                Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.GetVersionString("0.0.0", flavour, "0").Length, "0.0.0/" + flavour + " failed");
+                Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.GetVersionString("0.0.0", "0", flavour).Length, "0.0.0/" + flavour + " failed");
             }
         }
     }
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index cad83cd..6bcad15 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -30,8 +30,8 @@ namespace OpenSim
     public class VersionInfo
     {
         private const string VERSION_NUMBER = "0.7.5";
-        private const string BUILD_NUMBER = "1";
-        private const Flavour VERSION_FLAVOUR = Flavour.InfiniteGrid;
+        private const string IG_BUILD_NUMBER = "1";
+        private const Flavour VERSION_FLAVOUR = Flavour.IG;
 
         public enum Flavour
         {
@@ -42,22 +42,22 @@ namespace OpenSim
             Release,
             Post_Fixes,
             Extended,
-            InfiniteGrid
+            IG
         }
 
         public static string Version
         {
-            get { return GetVersionString(VERSION_NUMBER, VERSION_FLAVOUR, BUILD_NUMBER); }
+            get { return GetVersionString(VERSION_NUMBER, IG_BUILD_NUMBER, VERSION_FLAVOUR); }
         }
 
-        public static string GetVersionString(string versionNumber, Flavour flavour, string buildNumber)
+        public static string GetVersionString(string versionNumber, string buildNumber, Flavour flavour)
         {
             string versionString = "OpenSim " + versionNumber + " " + flavour + " build " + buildNumber;
             return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
         }
 
-        public const int VERSIONINFO_VERSION_LENGTH = 34;
-        
+        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 0ddd5ff..21ad265 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -555,7 +555,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <returns></returns>
         private int GetFundsForAgentID(UUID AgentID)
         {
-            int returnfunds = 7500001;	// Set it to the OpenSim version, plus the IG build number.  Muahahaha;
+            int returnfunds = 75001;	// Set it to the OpenSim version, plus the IG build number.  Muahahaha;
             
             return returnfunds;
         }
-- 
cgit v1.1