Merge branch 'master' into careminster-presence-refactor

This brings careminster on the level of master. To be tested

1 files changed, 31 insertions, 17 deletions

diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenSim/Data/SQLite/SQLiteAvatarData.cs
index 2e39cd0..b3f4a4c 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs
+++ b/OpenSim/Data/SQLite/SQLiteAvatarData.cs
@@ -26,34 +26,48 @@
  */
 
 using System;
-using System.Threading;
 using System.Collections.Generic;
-using System.Text;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Mono.Data.SqliteClient;
 
-namespace OpenGridServices.Manager
+namespace OpenSim.Data.SQLite
 {
-    public class BlockingQueue<T>
+    /// <summary>
+    /// A SQLite Interface for Avatar Data
+    /// </summary>
+    public class SQLiteAvatarData : SQLiteGenericTableHandler<AvatarBaseData>,
+            IAvatarData
     {
-        private Queue<T> _queue = new Queue<T>();
-        private object _queueSync = new object();
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public void Enqueue(T value)
+        public SQLiteAvatarData(string connectionString, string realm) :
+                base(connectionString, realm, "Avatar")
         {
-            lock (_queueSync)
-            {
-                _queue.Enqueue(value);
-                Monitor.Pulse(_queueSync);
-            }
         }
 
-        public T Dequeue()
+        public bool Delete(UUID principalID, string name)
         {
-            lock (_queueSync)
+            SqliteCommand cmd = new SqliteCommand();
+
+            cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = :PrincipalID and `Name` = :Name", m_Realm);
+            cmd.Parameters.Add(":PrincipalID", principalID.ToString());
+            cmd.Parameters.Add(":Name", name);
+
+            try
             {
-                if (_queue.Count < 1)
-                    Monitor.Wait(_queueSync);
+                if (ExecuteNonQuery(cmd, m_Connection) > 0)
+                    return true;
 
-                return _queue.Dequeue();
+                return false;
+            }
+            finally
+            {
+                CloseCommand(cmd);
             }
         }
     }