Merge branch 'release/opensim-rel-0.9.2.2.8617'

OpenSim-NGC · Aug 7, 2023 · f2c214a · f2c214a
2 parents 1e756c0 + e3f6b40
commit f2c214a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -494,7 +494,7 @@ public void addInventoryItem(InventoryItemBase item)
                         result.Parameters.AddWithValue("?salePrice", item.SalePrice);
                         result.Parameters.AddWithValue("?saleType", unchecked((sbyte)item.SaleType));
                         result.Parameters.AddWithValue("?creationDate", item.CreationDate);
-                        result.Parameters.AddWithValue("?groupID", item.GroupID);
+                        result.Parameters.AddWithValue("?groupID", item.GroupID.ToString());
                         result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
                         result.Parameters.AddWithValue("?flags", item.Flags);
 

diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -93,7 +93,7 @@ public OSDArray GetClassifiedRecords(UUID creatorId)
                 dbcon.Open();
                 using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                 {
-                    cmd.Parameters.AddWithValue("?Id", creatorId);
+                    cmd.Parameters.AddWithValue("?Id", creatorId.ToString());
                     using( MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
                     {
                         if(reader.HasRows)
@@ -142,8 +142,8 @@ public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
                 +  "`simname`,"
                 +  "`posglobal`,"
                 +  "`parcelname`,"
-                + "`classifiedflags`,"
-                + "`priceforlisting`) "
+                +  "`classifiedflags`,"
+                +  "`priceforlisting`) "
                 + "VALUES ("
                 + "?ClassifiedId,"
                 + "?CreatorId,"
@@ -288,7 +288,7 @@ public bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result)
                                 ad.ExpirationDate = Convert.ToInt32(reader["expirationdate"]);
                                 ad.ParentEstate = Convert.ToInt32(reader["parentestate"]);
                                 ad.Flags = (byte)reader.GetUInt32("classifiedflags");
-                                ad.Category = reader.GetInt32("category");
+                                ad.Category = Convert.ToInt32(reader["category"]);
                                 ad.Price = reader.GetInt16("priceforlisting");
                                 ad.Name = reader.GetString("name");
                                 ad.Description = reader.GetString("description");

diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
@@ -39,7 +39,7 @@ public class VersionInfo
     {
         public const string VersionNumber = "0.9.2.2";
         public const string AssemblyVersionNumber = "0.9.2.2";
-        public const string Release = "8615";
+        public const string Release = "8619";
 
         public const Flavour VERSION_FLAVOUR = Flavour.Dev;
 

diff --git a/addon-modules/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData/MySQLMoneyManager.cs b/addon-modules/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData/MySQLMoneyManager.cs
@@ -1392,7 +1392,7 @@ public bool updateTransactionStatus(UUID transactionID, int status, string descr
             MySqlCommand cmd = new MySqlCommand(sql, dbcon);
             cmd.Parameters.AddWithValue("?status", status);
             cmd.Parameters.AddWithValue("?desc", description);
-            cmd.Parameters.AddWithValue("?tranid", transactionID);
+            cmd.Parameters.AddWithValue("?tranid", transactionID.ToString());
 
             if (cmd.ExecuteNonQuery() > 0) bRet = true;