aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2012-03-09 03:32:49 +0000
committerUbitUmarov2012-03-09 03:32:49 +0000
commiteaef84ad1dc8f21d5e2db35e193c2d53e700ceed (patch)
tree8efe359172acc45e69d10a966eda1b116e3d90de
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentMerge branch 'ubitwork' (diff)
downloadopensim-SC_OLD-eaef84ad1dc8f21d5e2db35e193c2d53e700ceed.zip
opensim-SC_OLD-eaef84ad1dc8f21d5e2db35e193c2d53e700ceed.tar.gz
opensim-SC_OLD-eaef84ad1dc8f21d5e2db35e193c2d53e700ceed.tar.bz2
opensim-SC_OLD-eaef84ad1dc8f21d5e2db35e193c2d53e700ceed.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLXAssetData.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index 95ef72a..692ade7 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -190,7 +190,7 @@ namespace OpenSim.Data.MySQL
190 /// </summary> 190 /// </summary>
191 /// <param name="asset">Asset UUID to create</param> 191 /// <param name="asset">Asset UUID to create</param>
192 /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks> 192 /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
193 override public void StoreAsset(AssetBase asset) 193 override public bool StoreAsset(AssetBase asset)
194 { 194 {
195 lock (m_dbLock) 195 lock (m_dbLock)
196 { 196 {
@@ -265,7 +265,7 @@ namespace OpenSim.Data.MySQL
265 265
266 transaction.Rollback(); 266 transaction.Rollback();
267 267
268 return; 268 return false;
269 } 269 }
270 270
271 if (!ExistsData(dbcon, transaction, hash)) 271 if (!ExistsData(dbcon, transaction, hash))
@@ -289,7 +289,7 @@ namespace OpenSim.Data.MySQL
289 289
290 transaction.Rollback(); 290 transaction.Rollback();
291 291
292 return; 292 return false;
293 } 293 }
294 } 294 }
295 295
@@ -297,6 +297,7 @@ namespace OpenSim.Data.MySQL
297 } 297 }
298 } 298 }
299 } 299 }
300 return true;
300 } 301 }
301 302
302// private void UpdateAccessTime(AssetBase asset) 303// private void UpdateAccessTime(AssetBase asset)
@@ -497,4 +498,4 @@ namespace OpenSim.Data.MySQL
497 498
498 #endregion 499 #endregion
499 } 500 }
500} \ No newline at end of file 501}