From 67b852f8e54b73fb12aefd2a51b77457feae062a Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 22:21:18 +1000 Subject: Update version number stuff, and hack it into the money display. --- OpenSim/Framework/Servers/Tests/VersionInfoTests.cs | 2 +- OpenSim/Framework/VersionInfo.cs | 14 ++++++++------ .../OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs index 480f2bb..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).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/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index fc0fb1a..d33a080 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs @@ -31,8 +31,9 @@ namespace OpenSim { public const string VersionNumber = "0.9.0.1"; public const string AssemblyVersionNumber = "0.9.0.*"; + public const string IG_BUILD_NUMBER = "1"; - public const Flavour VERSION_FLAVOUR = Flavour.Release; + public const Flavour VERSION_FLAVOUR = Flavour.IG; public enum Flavour { @@ -43,21 +44,22 @@ namespace OpenSim RC3, Release, Post_Fixes, - Extended + Extended, + IG } public static string Version { - get { return GetVersionString(VersionNumber, VERSION_FLAVOUR); } + get { return GetVersionString(VersionNumber, IG_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 + " " + flavour; + string versionString = "OpenSim " + versionNumber + " " + flavour + " build " + buildNumber; return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); } - public const int VERSIONINFO_VERSION_LENGTH = 27; + public const int VERSIONINFO_VERSION_LENGTH = 39; /// /// 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..4c70a27 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs @@ -573,8 +573,8 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule /// private int GetFundsForAgentID(UUID AgentID) { - int returnfunds = 0; - + int returnfunds = 90101; // Set it to the OpenSim version, plus the IG build number. Muahahaha; + return returnfunds; } -- cgit v1.1