Merge branch 'master' into careminster

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index d560c5f..f566fde 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Data.MySQL
                 rollbackStore = GridDataMySqlFile.ParseFileReadValue("rollback") == "true";
                 opengridmode = GridDataMySqlFile.ParseFileReadValue("opengridmode") == "true";
 
-                if(rollbackStore)
+                if (rollbackStore)
                     m_log.Warn("[MysqlInventory] Enabling rollback mode in: " + rollbackDir);
 
                 database =
@@ -264,7 +264,7 @@ namespace OpenSim.Data.MySQL
             {
                 database.Reconnect();
                 m_log.Error(e.ToString());
-                return null;
+                throw;
             }
         }
 
@@ -552,7 +552,7 @@ namespace OpenSim.Data.MySQL
 
         private void StoreRollbackItem(UUID ItemID)
         {
-            if(rollbackStore == true)
+            if (rollbackStore == true)
             {
                 string todaysPath = RollbackGetTodaysPath();
 
@@ -1008,7 +1008,7 @@ namespace OpenSim.Data.MySQL
                     StoreRollbackFolder(f.ID);
                     deleteOneFolder(f.ID);
 
-                    if(rollbackStore)
+                    if (rollbackStore)
                     {
                         foreach (InventoryItemBase itemBase in getInventoryInFolder(f.ID))
                         {