From 0cb805a64cff87b5696528afa01c76732dae98aa Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 22 Aug 2014 20:28:56 +0100
Subject: [PATCH] Remove query locking in MySQLUserProfileData.  This is not
 necessary as the connection is not shared.

---
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 28 ++++++---------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index adb75d63dc..7e846e385a 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -46,11 +46,6 @@ namespace OpenSim.Data.MySQL
         {
             get; set;
         }
-
-        protected object Lock
-        {
-            get; set;
-        }
         
         protected virtual Assembly Assembly
         {
@@ -1025,11 +1020,8 @@ namespace OpenSim.Data.MySQL
                                     put.Parameters.AddWithValue("?TagId", props.TagId.ToString());
                                     put.Parameters.AddWithValue("?DataKey", props.DataKey.ToString());
                                     put.Parameters.AddWithValue("?DataVal", props.DataVal.ToString());
-                                    
-                                    lock(Lock)
-                                    {
-                                        put.ExecuteNonQuery();
-                                    }
+
+                                    put.ExecuteNonQuery();
                                 }
                             }
                         }
@@ -1065,14 +1057,11 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?UserId", props.UserId.ToString());
-                        cmd.Parameters.AddWithValue("?TagId", props.TagId.ToString ());
-                        cmd.Parameters.AddWithValue("?DataKey", props.DataKey.ToString ());
-                        cmd.Parameters.AddWithValue("?DataVal", props.DataKey.ToString ());
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+                        cmd.Parameters.AddWithValue("?TagId", props.TagId.ToString());
+                        cmd.Parameters.AddWithValue("?DataKey", props.DataKey.ToString());
+                        cmd.Parameters.AddWithValue("?DataVal", props.DataKey.ToString());
+
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
@@ -1086,5 +1075,4 @@ namespace OpenSim.Data.MySQL
         }
         #endregion Integration
     }
-}
-
+}
\ No newline at end of file