From 9b2f186a8ca02214650483e6a8757843dbe32867 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 27 Sep 2016 21:10:01 +0100
Subject: MySQLFSAssetData  on store, if a asset already exists, assume its a
 valid store or regions will keep retry. The other DBs do replace the item,
 why doesn't FS do the same?

---
 OpenSim/Data/MySQL/MySQLFSAssetData.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Data')

diff --git a/OpenSim/Data/MySQL/MySQLFSAssetData.cs b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
index ce40c03..46bdd99 100644
--- a/OpenSim/Data/MySQL/MySQLFSAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
@@ -222,6 +222,7 @@ namespace OpenSim.Data.MySQL
                     cmd.Parameters.AddWithValue("?name", meta.Name);
                     cmd.Parameters.AddWithValue("?description", meta.Description);
                     cmd.Parameters.AddWithValue("?type", meta.Type.ToString());
+//                    cmd.Parameters.AddWithValue("?type", meta.Type);
                     cmd.Parameters.AddWithValue("?hash", hash);
                     cmd.Parameters.AddWithValue("?asset_flags", meta.Flags);
 
@@ -239,7 +240,12 @@ namespace OpenSim.Data.MySQL
                     //ExecuteNonQuery(cmd);
 
                 }
-                return false;
+
+//                return false;
+                // if the asset already exits
+                // assume it was already correctly stored
+                // or regions will keep retry.
+                return true;
             }
             catch(Exception e)
             {
-- 
cgit v1.1


From 46dd899d9e98c88c1a4cd2be3c4065a317a8f35d Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 27 Sep 2016 21:29:09 +0100
Subject: MySQLFSAssetData  asset type is a int not a varchar

---
 OpenSim/Data/MySQL/MySQLFSAssetData.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data')

diff --git a/OpenSim/Data/MySQL/MySQLFSAssetData.cs b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
index 46bdd99..4ed2de6 100644
--- a/OpenSim/Data/MySQL/MySQLFSAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
@@ -221,8 +221,8 @@ namespace OpenSim.Data.MySQL
                     cmd.Parameters.AddWithValue("?id", meta.ID);
                     cmd.Parameters.AddWithValue("?name", meta.Name);
                     cmd.Parameters.AddWithValue("?description", meta.Description);
-                    cmd.Parameters.AddWithValue("?type", meta.Type.ToString());
-//                    cmd.Parameters.AddWithValue("?type", meta.Type);
+//                    cmd.Parameters.AddWithValue("?type", meta.Type.ToString());
+                    cmd.Parameters.AddWithValue("?type", meta.Type);
                     cmd.Parameters.AddWithValue("?hash", hash);
                     cmd.Parameters.AddWithValue("?asset_flags", meta.Flags);
 
-- 
cgit v1.1