aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authoronefang2019-05-19 22:21:18 +1000
committeronefang2019-05-19 22:21:18 +1000
commit67b852f8e54b73fb12aefd2a51b77457feae062a (patch)
tree7c8eb960479fc8a39d35f75dd49a3703b178622b /OpenSim
parentRemove useless executable bit that Windows adds. (diff)
downloadopensim-SC_OLD-67b852f8e54b73fb12aefd2a51b77457feae062a.zip
opensim-SC_OLD-67b852f8e54b73fb12aefd2a51b77457feae062a.tar.gz
opensim-SC_OLD-67b852f8e54b73fb12aefd2a51b77457feae062a.tar.bz2
opensim-SC_OLD-67b852f8e54b73fb12aefd2a51b77457feae062a.tar.xz
Update version number stuff, and hack it into the money display.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/Tests/VersionInfoTests.cs2
-rw-r--r--OpenSim/Framework/VersionInfo.cs14
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs4
3 files changed, 11 insertions, 9 deletions
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
47 { 47 {
48 foreach (VersionInfo.Flavour flavour in Enum.GetValues(typeof(VersionInfo.Flavour))) 48 foreach (VersionInfo.Flavour flavour in Enum.GetValues(typeof(VersionInfo.Flavour)))
49 { 49 {
50 Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.GetVersionString("0.0.0", flavour).Length, "0.0.0/" + flavour + " failed"); 50 Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.GetVersionString("0.0.0", "0", flavour).Length, "0.0.0/" + flavour + " failed");
51 } 51 }
52 } 52 }
53 } 53 }
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
31 { 31 {
32 public const string VersionNumber = "0.9.0.1"; 32 public const string VersionNumber = "0.9.0.1";
33 public const string AssemblyVersionNumber = "0.9.0.*"; 33 public const string AssemblyVersionNumber = "0.9.0.*";
34 public const string IG_BUILD_NUMBER = "1";
34 35
35 public const Flavour VERSION_FLAVOUR = Flavour.Release; 36 public const Flavour VERSION_FLAVOUR = Flavour.IG;
36 37
37 public enum Flavour 38 public enum Flavour
38 { 39 {
@@ -43,21 +44,22 @@ namespace OpenSim
43 RC3, 44 RC3,
44 Release, 45 Release,
45 Post_Fixes, 46 Post_Fixes,
46 Extended 47 Extended,
48 IG
47 } 49 }
48 50
49 public static string Version 51 public static string Version
50 { 52 {
51 get { return GetVersionString(VersionNumber, VERSION_FLAVOUR); } 53 get { return GetVersionString(VersionNumber, IG_BUILD_NUMBER, VERSION_FLAVOUR); }
52 } 54 }
53 55
54 public static string GetVersionString(string versionNumber, Flavour flavour) 56 public static string GetVersionString(string versionNumber, string buildNumber, Flavour flavour)
55 { 57 {
56 string versionString = "OpenSim " + versionNumber + " " + flavour; 58 string versionString = "OpenSim " + versionNumber + " " + flavour + " build " + buildNumber;
57 return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); 59 return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
58 } 60 }
59 61
60 public const int VERSIONINFO_VERSION_LENGTH = 27; 62 public const int VERSIONINFO_VERSION_LENGTH = 39;
61 63
62 /// <value> 64 /// <value>
63 /// This is the external interface version. It is separate from the OpenSimulator project version. 65 /// 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
573 /// <returns></returns> 573 /// <returns></returns>
574 private int GetFundsForAgentID(UUID AgentID) 574 private int GetFundsForAgentID(UUID AgentID)
575 { 575 {
576 int returnfunds = 0; 576 int returnfunds = 90101; // Set it to the OpenSim version, plus the IG build number. Muahahaha;
577 577
578 return returnfunds; 578 return returnfunds;
579 } 579 }
580 580