Next release is OpenSim-NGC Tranquillity

OpenSim-NGC · Oct 15, 2023 · 4083fab · 4083fab
1 parent c27624d
commit 4083fab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 46 deletions.
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
@@ -39,30 +39,16 @@ public class VersionInfo
     {
         public const string VersionNumber = "0.9.2.2";
         public const string AssemblyVersionNumber = "0.9.2.2";
-        public const string Release = "8624";
-
-        public const Flavour VERSION_FLAVOUR = Flavour.Dev;
-
-        public enum Flavour
-        {
-            Unknown,
-            Dev,
-            RC1,
-            RC2,
-            RC3,
-            Release,
-            Post_Fixes,
-            Extended
-        }
+        public const string Release = "8688";
 
         public static string Version
         {
-            get { return GetVersionString(VersionNumber, Release, VERSION_FLAVOUR); }
+            get { return GetVersionString(VersionNumber, Release); }
         }
 
-        public static string GetVersionString(string versionNumber, string release, Flavour flavour)
+        public static string GetVersionString(string versionNumber, string release)
         {
-            string versionString = "OpenSim-NGC " + versionNumber + "." + release + " Yeti " + flavour;
+            string versionString = "OpenSim-NGC Tranquillity " + versionNumber + "." + release;
             return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
         }
 

diff --git a/OpenSim/Framework/VersionInfo.tt b/OpenSim/Framework/VersionInfo.tt
@@ -41,28 +41,14 @@ namespace OpenSim
         public const string AssemblyVersionNumber = "0.9.2.2";
         public const string Release = "<#= (int)DateTimeOffset.UtcNow.Subtract(new DateTimeOffset(2000, 1, 1, 0, 0, 0, TimeSpan.Zero)).TotalDays #>";
 
-        public const Flavour VERSION_FLAVOUR = Flavour.Dev;
-
-        public enum Flavour
-        {
-            Unknown,
-            Dev,
-            RC1,
-            RC2,
-            RC3,
-            Release,
-            Post_Fixes,
-            Extended
-        }
-
         public static string Version
         {
-            get { return GetVersionString(VersionNumber, Release, VERSION_FLAVOUR); }
+            get { return GetVersionString(VersionNumber, Release); }
         }
 
-        public static string GetVersionString(string versionNumber, string release, Flavour flavour)
+        public static string GetVersionString(string versionNumber, string release)
         {
-            string versionString = "OpenSim-NGC " + versionNumber + "." + release + " Yeti " + flavour;
+            string versionString = "OpenSim-NGC Tranquillity " + versionNumber + "." + release;
             return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
         }
 

diff --git a/addon-modules/Gloebit/GloebitMoneyModule/GloebitMoneyModule.cs b/addon-modules/Gloebit/GloebitMoneyModule/GloebitMoneyModule.cs
@@ -725,17 +725,6 @@ public void PostInitialise()
                     // 0.9.0.1, 0.9.0.2, etc.
                     detectedOSVersion = "=>0.9.0.1";
                     m_newLandPassFlow = true;
-                } else {
-                    // Need to pull version flavour and check it.
-                    // TODO: may need to split on spaces or hyphens and then pull last field because flavour is not friggin public
-                    char[] dChars = { '-', ' ' };
-                    string[] versionParts = m_opensimVersion.Split(dChars, System.StringSplitOptions.RemoveEmptyEntries);
-                    string flavour = versionParts[versionParts.Length - 1];     // TODO: do we every have to worry about this being length 0?
-                    if (flavour == OpenSim.VersionInfo.Flavour.Release.ToString()) {
-                        // 0.9.0 release
-                        detectedOSVersion = "=0.9.0";
-                        m_newLandPassFlow = true;
-                    }
                 }
                 // TODO: Unclear if post-fixes is a necessary flavour check yet.
             } else {