1 files changed, 36 insertions, 37 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Data/Null/NullXGroupData.cs
index d7198f0..7a86b9f 100644
--- a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Data/Null/NullXGroupData.cs
@@ -26,66 +26,65 @@
  */
 
 using System;
-using OpenMetaverse;
-using log4net;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Data;
 
-namespace OpenSim.Region.Framework.Scenes.Scripting
+namespace OpenSim.Data.Null
 {
-    public class NullScriptHost : IScriptHost
+    public class NullXGroupData : NullGenericDataHandler, IXGroupData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private Vector3 m_pos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30);
+        private Dictionary<UUID, XGroup> m_groups = new Dictionary<UUID, XGroup>();
 
-        public string Name
-        {
-            get { return "Object"; }
-            set { }
-        }
+        public NullXGroupData(string connectionString, string realm) {}
 
-        public string SitName
+        public bool StoreGroup(XGroup group)
         {
-            get { return String.Empty; }
-            set { }
-        }
+            lock (m_groups)
+            {
+                m_groups[group.groupID] = group.Clone();
+            }
 
-        public string TouchName
-        {
-            get { return String.Empty; }
-            set { }
+            return true;
         }
 
-        public string Description
+        public XGroup[] GetGroups(string field, string val)
         {
-            get { return String.Empty; }
-            set { }
+            return GetGroups(new string[] { field }, new string[] { val });
         }
 
-        public UUID UUID
+        public XGroup[] GetGroups(string[] fields, string[] vals)
         {
-            get { return UUID.Zero; }
-        }
+            lock (m_groups)
+            {
+                List<XGroup> origGroups = Get<XGroup>(fields, vals, m_groups.Values.ToList());
 
-        public UUID OwnerID
-        {
-            get { return UUID.Zero; }
+                return origGroups.Select(g => g.Clone()).ToArray();
+            }
         }
 
-        public UUID CreatorID
+        public bool DeleteGroups(string field, string val)
         {
-            get { return UUID.Zero; }
+            return DeleteGroups(new string[] { field }, new string[] { val });
         }
 
-        public Vector3 AbsolutePosition
+        public bool DeleteGroups(string[] fields, string[] vals)
         {
-            get { return m_pos; }
-        }
+            lock (m_groups)
+            {
+                XGroup[] groupsToDelete = GetGroups(fields, vals);
+                Array.ForEach(groupsToDelete, g => m_groups.Remove(g.groupID));
+            }
 
-        public void SetText(string text, Vector3 color, double alpha)
-        {
-            m_log.Warn("Tried to SetText "+text+" on NullScriptHost");
+            return true;
         }
     }
-}
+}
\ No newline at end of file