aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-02-23 07:19:24 +1000
committerDavid Walter Seikel2013-02-23 07:19:24 +1000
commitb51ccc44f472c1aa7818b49773bb10c01b771ce1 (patch)
tree9ab9a2de6f2364cec85e699ec682fa7c555ab453 /OpenSim/Framework/Servers
parentReplaced Ionic.Zip.dll with a new one that fixes a bug in it. DotNetZip (from... (diff)
downloadopensim-SC_OLD-b51ccc44f472c1aa7818b49773bb10c01b771ce1.zip
opensim-SC_OLD-b51ccc44f472c1aa7818b49773bb10c01b771ce1.tar.gz
opensim-SC_OLD-b51ccc44f472c1aa7818b49773bb10c01b771ce1.tar.bz2
opensim-SC_OLD-b51ccc44f472c1aa7818b49773bb10c01b771ce1.tar.xz
Add IG version bits.
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, 9 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
index 480f2bb..2a59ee3 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", flavour, "0").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 07ad3b3..cad83cd 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -30,7 +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 Flavour VERSION_FLAVOUR = Flavour.Post_Fixes; 33 private const string BUILD_NUMBER = "1";
34 private const Flavour VERSION_FLAVOUR = Flavour.InfiniteGrid;
34 35
35 public enum Flavour 36 public enum Flavour
36 { 37 {
@@ -40,21 +41,22 @@ namespace OpenSim
40 RC2, 41 RC2,
41 Release, 42 Release,
42 Post_Fixes, 43 Post_Fixes,
43 Extended 44 Extended,
45 InfiniteGrid
44 } 46 }
45 47
46 public static string Version 48 public static string Version
47 { 49 {
48 get { return GetVersionString(VERSION_NUMBER, VERSION_FLAVOUR); } 50 get { return GetVersionString(VERSION_NUMBER, VERSION_FLAVOUR, BUILD_NUMBER); }
49 } 51 }
50 52
51 public static string GetVersionString(string versionNumber, Flavour flavour) 53 public static string GetVersionString(string versionNumber, Flavour flavour, string buildNumber)
52 { 54 {
53 string versionString = "OpenSim " + versionNumber + " " + flavour; 55 string versionString = "OpenSim " + versionNumber + " " + flavour + " build " + buildNumber;
54 return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); 56 return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
55 } 57 }
56 58
57 public const int VERSIONINFO_VERSION_LENGTH = 27; 59 public const int VERSIONINFO_VERSION_LENGTH = 34;
58 60
59 /// <value> 61 /// <value>
60 /// 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.