aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/Tests/VersionInfoTests.cs2
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs14
2 files changed, 8 insertions, 8 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
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, "0").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/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
30 public class VersionInfo 30 public class VersionInfo
31 { 31 {
32 private const string VERSION_NUMBER = "0.7.5"; 32 private const string VERSION_NUMBER = "0.7.5";
33 private const string BUILD_NUMBER = "1"; 33 private const string IG_BUILD_NUMBER = "1";
34 private const Flavour VERSION_FLAVOUR = Flavour.InfiniteGrid; 34 private const Flavour VERSION_FLAVOUR = Flavour.IG;
35 35
36 public enum Flavour 36 public enum Flavour
37 { 37 {
@@ -42,22 +42,22 @@ namespace OpenSim
42 Release, 42 Release,
43 Post_Fixes, 43 Post_Fixes,
44 Extended, 44 Extended,
45 InfiniteGrid 45 IG
46 } 46 }
47 47
48 public static string Version 48 public static string Version
49 { 49 {
50 get { return GetVersionString(VERSION_NUMBER, VERSION_FLAVOUR, BUILD_NUMBER); } 50 get { return GetVersionString(VERSION_NUMBER, IG_BUILD_NUMBER, VERSION_FLAVOUR); }
51 } 51 }
52 52
53 public static string GetVersionString(string versionNumber, Flavour flavour, string buildNumber) 53 public static string GetVersionString(string versionNumber, string buildNumber, Flavour flavour)
54 { 54 {
55 string versionString = "OpenSim " + versionNumber + " " + flavour + " build " + buildNumber; 55 string versionString = "OpenSim " + versionNumber + " " + flavour + " build " + buildNumber;
56 return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); 56 return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
57 } 57 }
58 58
59 public const int VERSIONINFO_VERSION_LENGTH = 34; 59 public const int VERSIONINFO_VERSION_LENGTH = 39;
60 60
61 /// <value> 61 /// <value>
62 /// This is the external interface version. It is separate from the OpenSimulator project version. 62 /// This is the external interface version. It is separate from the OpenSimulator project version.
63 /// 63 ///