diff options
author | UbitUmarov | 2017-05-06 01:25:54 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-06 01:25:54 +0100 |
commit | d9038e650a8cbacc3463c6989b5af1e8429a1e8b (patch) | |
tree | 5d1b31679650853bf9710c96dcda6bd0f45096aa /OpenSim/Data/MySQL/MySQLXAssetData.cs | |
parent | revert to older CSJ2K.dll since new seems have issues on linux with existent... (diff) | |
download | opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.zip opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.gz opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.bz2 opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.xz |
MySQLConnector is not a MS product
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLXAssetData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLXAssetData.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs index 2c6acde..2ef7f8f 100644 --- a/OpenSim/Data/MySQL/MySQLXAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs | |||
@@ -97,6 +97,7 @@ namespace OpenSim.Data.MySQL | |||
97 | dbcon.Open(); | 97 | dbcon.Open(); |
98 | Migration m = new Migration(dbcon, Assembly, "XAssetStore"); | 98 | Migration m = new Migration(dbcon, Assembly, "XAssetStore"); |
99 | m.Update(); | 99 | m.Update(); |
100 | dbcon.Close(); | ||
100 | } | 101 | } |
101 | } | 102 | } |
102 | 103 | ||
@@ -184,6 +185,7 @@ namespace OpenSim.Data.MySQL | |||
184 | m_log.Error(string.Format("[MYSQL XASSET DATA]: Failure fetching asset {0}", assetID), e); | 185 | m_log.Error(string.Format("[MYSQL XASSET DATA]: Failure fetching asset {0}", assetID), e); |
185 | } | 186 | } |
186 | } | 187 | } |
188 | dbcon.Close(); | ||
187 | } | 189 | } |
188 | 190 | ||
189 | return asset; | 191 | return asset; |
@@ -303,6 +305,7 @@ namespace OpenSim.Data.MySQL | |||
303 | 305 | ||
304 | transaction.Commit(); | 306 | transaction.Commit(); |
305 | } | 307 | } |
308 | dbcon.Close(); | ||
306 | } | 309 | } |
307 | } | 310 | } |
308 | 311 | ||
@@ -344,6 +347,7 @@ namespace OpenSim.Data.MySQL | |||
344 | "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}", | 347 | "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}", |
345 | assetMetadata.ID, assetMetadata.Name); | 348 | assetMetadata.ID, assetMetadata.Name); |
346 | } | 349 | } |
350 | dbcon.Close(); | ||
347 | } | 351 | } |
348 | } | 352 | } |
349 | 353 | ||
@@ -474,6 +478,7 @@ namespace OpenSim.Data.MySQL | |||
474 | m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString()); | 478 | m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString()); |
475 | } | 479 | } |
476 | } | 480 | } |
481 | dbcon.Close(); | ||
477 | } | 482 | } |
478 | 483 | ||
479 | return retList; | 484 | return retList; |
@@ -492,9 +497,9 @@ namespace OpenSim.Data.MySQL | |||
492 | cmd.Parameters.AddWithValue("?ID", id); | 497 | cmd.Parameters.AddWithValue("?ID", id); |
493 | cmd.ExecuteNonQuery(); | 498 | cmd.ExecuteNonQuery(); |
494 | } | 499 | } |
495 | |||
496 | // TODO: How do we deal with data from deleted assets? Probably not easily reapable unless we | 500 | // TODO: How do we deal with data from deleted assets? Probably not easily reapable unless we |
497 | // keep a reference count (?) | 501 | // keep a reference count (?) |
502 | dbcon.Close(); | ||
498 | } | 503 | } |
499 | 504 | ||
500 | return true; | 505 | return true; |