Merge branch 'release/opensim-rel-0.9.2.2.8603'

OpenSim-NGC · Aug 3, 2023 · 1e756c0 · 1e756c0
2 parents e534ce5 + 089c82f
commit 1e756c0
Show file tree

Hide file tree

Showing 52 changed files with 760 additions and 661 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,7 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Denote all files that are truly binary and should not be modified.
 *.lsl binary
 *.dat binary
 *.bmp binary

diff --git a/.github/workflows/msbuild48.yml b/.github/workflows/msbuild48.yml
diff --git a/.github/workflows/msbuildnet6.yml b/.github/workflows/msbuildnet6.yml
diff --git a/OpenSim/Addons/OfflineIM/OpenSim.Addons.OfflineIM.csproj b/OpenSim/Addons/OfflineIM/OpenSim.Addons.OfflineIM.csproj
@@ -9,7 +9,6 @@
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Mono.Addins" Version="1.4.1" />
-    <PackageReference Include="MySql.Data" Version="8.0.31" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Nini">

diff --git a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
@@ -31,7 +31,6 @@
 using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using MySql.Data.MySqlClient;
 
 namespace OpenSim.Data.MySQL
 {

diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -30,10 +30,9 @@
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
-using MySql.Data.MySqlClient;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Data;
+using MySqlConnector;
 
 namespace OpenSim.Data.MySQL
 {

diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -32,7 +32,7 @@
 using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 
 namespace OpenSim.Data.MySQL
 {

diff --git a/OpenSim/Data/MySQL/MySQLAvatarData.cs b/OpenSim/Data/MySQL/MySQLAvatarData.cs
@@ -31,9 +31,9 @@
 using System.Reflection;
 using System.Threading;
 using log4net;
+using MySqlConnector;
 using OpenMetaverse;
 using OpenSim.Framework;
-using MySql.Data.MySqlClient;
 
 namespace OpenSim.Data.MySQL
 {

diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -30,11 +30,9 @@
 using System.Data;
 using System.Reflection;
 using log4net;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Data;
 
 namespace OpenSim.Data.MySQL
 {
@@ -498,7 +496,7 @@ public List<int> GetEstatesByOwner(UUID ownerID)
                 using (MySqlCommand cmd = dbcon.CreateCommand())
                 {
                     cmd.CommandText = "select estateID from estate_settings where EstateOwner = ?EstateOwner";
-                    cmd.Parameters.AddWithValue("?EstateOwner", ownerID);
+                    cmd.Parameters.AddWithValue("?EstateOwner", ownerID.ToString());
 
                     using (IDataReader reader = cmd.ExecuteReader())
                     {
@@ -530,7 +528,7 @@ public bool LinkRegion(UUID regionID, int estateID)
                      {
                         cmd.Transaction = transaction;
                         cmd.CommandText = "delete from estate_map where RegionID = ?RegionID";
-                        cmd.Parameters.AddWithValue("?RegionID", regionID);
+                        cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
 
                         cmd.ExecuteNonQuery();
                     }
@@ -539,7 +537,7 @@ public bool LinkRegion(UUID regionID, int estateID)
                     {
                         cmd.Transaction = transaction;
                         cmd.CommandText = "insert into estate_map values (?RegionID, ?EstateID)";
-                        cmd.Parameters.AddWithValue("?RegionID", regionID);
+                        cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
                         cmd.Parameters.AddWithValue("?EstateID", estateID);
 
                         int ret = cmd.ExecuteNonQuery();

diff --git a/OpenSim/Data/MySQL/MySQLFSAssetData.cs b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
@@ -30,10 +30,9 @@
 using System.Collections.Generic;
 using System.Data;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using log4net;
-using MySql.Data.MySqlClient;
 using OpenMetaverse;
+using MySqlConnector;
 
 namespace OpenSim.Data.MySQL
 {
@@ -256,7 +255,7 @@ public bool Store(AssetMetadata meta, string hash)
             catch(Exception e)
             {
                 m_log.Error("[FSAssets] Failed to store asset with ID " + meta.ID);
-        m_log.Error(e.ToString());
+                m_log.Error(e.ToString());
                 return false;
             }
         }

diff --git a/OpenSim/Data/MySQL/MySQLFramework.cs b/OpenSim/Data/MySQL/MySQLFramework.cs
@@ -25,13 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using MySqlConnector;
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
-using MySql.Data.MySqlClient;
 
 namespace OpenSim.Data.MySQL
 {

diff --git a/OpenSim/Data/MySQL/MySQLFriendsData.cs b/OpenSim/Data/MySQL/MySQLFriendsData.cs
@@ -26,12 +26,8 @@
  */
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
+using MySqlConnector;
 using OpenMetaverse;
-using OpenSim.Framework;
-using MySql.Data.MySqlClient;
 
 namespace OpenSim.Data.MySQL
 {

diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -30,7 +30,7 @@
 using System.Data;
 using System.Reflection;
 using System.Text;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using OpenMetaverse;
 
 namespace OpenSim.Data.MySQL
@@ -107,8 +107,7 @@ private void CheckColumnNames(IDataReader reader)
             DataTable schemaTable = reader.GetSchemaTable();
             foreach (DataRow row in schemaTable.Rows)
             {
-                if (row["ColumnName"] != null &&
-                        (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
+                if (row["ColumnName"] != null && (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
                     columnNames.Add(row["ColumnName"].ToString());
             }
 

diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -26,14 +26,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-using System.Threading;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using MySql.Data.MySqlClient;
 
 namespace OpenSim.Data.MySQL
 {

diff --git a/OpenSim/Data/MySQL/MySQLGroupsData.cs b/OpenSim/Data/MySQL/MySQLGroupsData.cs
@@ -26,15 +26,10 @@
  */
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Reflection;
-
 using OpenSim.Framework;
-using OpenSim.Data.MySQL;
-
 using OpenMetaverse;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 
 namespace OpenSim.Data.MySQL
 {

diff --git a/OpenSim/Data/MySQL/MySQLHGTravelData.cs b/OpenSim/Data/MySQL/MySQLHGTravelData.cs
@@ -26,14 +26,8 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-using System.Threading;
-using log4net;
+using MySqlConnector;
 using OpenMetaverse;
-using OpenSim.Framework;
-using MySql.Data.MySqlClient;
 
 namespace OpenSim.Data.MySQL
 {

diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -29,10 +29,10 @@
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
-using MySql.Data.MySqlClient;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Data;
+using MySqlConnector;
 
 namespace OpenSim.Data.MySQL
 {