From 99c64f0645c6ecf4a0e2667b84946afd960b486c Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Fri, 9 Mar 2012 02:45:53 +0000
Subject: [PATCH] Fix a merge artefact

---
 OpenSim/Data/MySQL/MySQLXAssetData.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index 95ef72a09b..692ade7179 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -190,7 +190,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="asset">Asset UUID to create</param>
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
             lock (m_dbLock)
             {
@@ -265,7 +265,7 @@ namespace OpenSim.Data.MySQL
 
                             transaction.Rollback();
 
-                            return;
+                            return false;
                         }
 
                         if (!ExistsData(dbcon, transaction, hash))
@@ -289,7 +289,7 @@ namespace OpenSim.Data.MySQL
     
                                 transaction.Rollback();
     
-                                return;
+                                return false;
                             }
                         }
     
@@ -297,6 +297,7 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
+            return true;
         }
 
 //        private void UpdateAccessTime(AssetBase asset)
@@ -497,4 +498,4 @@ namespace OpenSim.Data.MySQL
 
         #endregion
     }
-}
\ No newline at end of file
+}