aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorUbitUmarov2016-09-27 21:10:01 +0100
committerUbitUmarov2016-09-27 21:10:01 +0100
commit9b2f186a8ca02214650483e6a8757843dbe32867 (patch)
treee503bf21b0cbb748bbcc24077f3448e7e6e6c750 /OpenSim/Data
parentsave oar: simplify confusing successefull assets saving message (diff)
downloadopensim-SC_OLD-9b2f186a8ca02214650483e6a8757843dbe32867.zip
opensim-SC_OLD-9b2f186a8ca02214650483e6a8757843dbe32867.tar.gz
opensim-SC_OLD-9b2f186a8ca02214650483e6a8757843dbe32867.tar.bz2
opensim-SC_OLD-9b2f186a8ca02214650483e6a8757843dbe32867.tar.xz
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?
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLFSAssetData.cs8
1 files changed, 7 insertions, 1 deletions
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
222 cmd.Parameters.AddWithValue("?name", meta.Name); 222 cmd.Parameters.AddWithValue("?name", meta.Name);
223 cmd.Parameters.AddWithValue("?description", meta.Description); 223 cmd.Parameters.AddWithValue("?description", meta.Description);
224 cmd.Parameters.AddWithValue("?type", meta.Type.ToString()); 224 cmd.Parameters.AddWithValue("?type", meta.Type.ToString());
225// cmd.Parameters.AddWithValue("?type", meta.Type);
225 cmd.Parameters.AddWithValue("?hash", hash); 226 cmd.Parameters.AddWithValue("?hash", hash);
226 cmd.Parameters.AddWithValue("?asset_flags", meta.Flags); 227 cmd.Parameters.AddWithValue("?asset_flags", meta.Flags);
227 228
@@ -239,7 +240,12 @@ namespace OpenSim.Data.MySQL
239 //ExecuteNonQuery(cmd); 240 //ExecuteNonQuery(cmd);
240 241
241 } 242 }
242 return false; 243
244// return false;
245 // if the asset already exits
246 // assume it was already correctly stored
247 // or regions will keep retry.
248 return true;
243 } 249 }
244 catch(Exception e) 250 catch(Exception e)
245 { 251 {