Remove parts locking from data classes since these are using a copy of the scene object

1 files changed, 45 insertions, 49 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
index 4ce93e5..7ff8737 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -89,7 +89,6 @@ namespace OpenSim.Data.MSSQL
             Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
             SceneObjectGroup grp = null;
 
-
             string sql = "SELECT *, " +
                            "sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " +
                            "FROM prims " +
@@ -232,66 +231,63 @@ namespace OpenSim.Data.MSSQL
         /// <param name="regionUUID"></param>
         public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
-            lock (obj.Children)
+            _Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
+
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
             {
-                _Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
-    
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                conn.Open();
+                SqlTransaction transaction = conn.BeginTransaction();
+
+                try
                 {
-                    conn.Open();
-                    SqlTransaction transaction = conn.BeginTransaction();
-    
-                    try
+                    foreach (SceneObjectPart sceneObjectPart in obj.Children.Values)
                     {
-                        foreach (SceneObjectPart sceneObjectPart in obj.Children.Values)
+                        //Update prim
+                        using (SqlCommand sqlCommand = conn.CreateCommand())
                         {
-                            //Update prim
-                            using (SqlCommand sqlCommand = conn.CreateCommand())
+                            sqlCommand.Transaction = transaction;
+                            try
                             {
-                                sqlCommand.Transaction = transaction;
-                                try
-                                {
-                                    StoreSceneObjectPrim(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
-                                }
-                                catch (SqlException sqlEx)
-                                {
-                                    _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrim SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
-                                    throw;
-                                }
+                                StoreSceneObjectPrim(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
                             }
-    
-                            //Update primshapes
-                            using (SqlCommand sqlCommand = conn.CreateCommand())
+                            catch (SqlException sqlEx)
                             {
-                                sqlCommand.Transaction = transaction;
-                                try
-                                {
-                                    StoreSceneObjectPrimShapes(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
-                                }
-                                catch (SqlException sqlEx)
-                                {
-                                    _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrimShapes SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
-                                    throw;
-                                }
+                                _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrim SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
+                                throw;
                             }
                         }
-    
-                        transaction.Commit();
-                    }
-                    catch (Exception ex)
-                    {
-                        _Log.ErrorFormat("[REGION DB]: Store SceneObjectGroup error: {0}, Rolling back...", ex.Message);
-                        try
-                        {
-                            transaction.Rollback();
-                        }
-                        catch (Exception ex2)
+
+                        //Update primshapes
+                        using (SqlCommand sqlCommand = conn.CreateCommand())
                         {
-                            //Show error
-                            _Log.InfoFormat("[REGION DB]: Rollback of SceneObjectGroup store transaction failed with error: {0}", ex2.Message);
-    
+                            sqlCommand.Transaction = transaction;
+                            try
+                            {
+                                StoreSceneObjectPrimShapes(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
+                            }
+                            catch (SqlException sqlEx)
+                            {
+                                _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrimShapes SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
+                                throw;
+                            }
                         }
                     }
+
+                    transaction.Commit();
+                }
+                catch (Exception ex)
+                {
+                    _Log.ErrorFormat("[REGION DB]: Store SceneObjectGroup error: {0}, Rolling back...", ex.Message);
+                    try
+                    {
+                        transaction.Rollback();
+                    }
+                    catch (Exception ex2)
+                    {
+                        //Show error
+                        _Log.InfoFormat("[REGION DB]: Rollback of SceneObjectGroup store transaction failed with error: {0}", ex2.Message);
+
+                    }
                 }
             }
         }