8 files changed, 75 insertions, 30 deletions

diff --git a/OpenSim/Region/Environment/Interfaces/IXfer.cs b/OpenSim/Region/Environment/Interfaces/IXfer.cs
new file mode 100644
index 0000000..a19ba8d
--- /dev/null
+++ b/OpenSim/Region/Environment/Interfaces/IXfer.cs
@@ -0,0 +1,11 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Region.Environment.Interfaces

+{

+    public interface IXfer

+    {

+        bool AddNewFile(string fileName, byte[] data);

+    }

+}

diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index be3384b..ea416cb 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -28,27 +28,23 @@ namespace OpenSim.Region.Environment
         /// <param name="scene"></param>

         public void CreateDefaultModules(Scene scene, string exceptModules)

         {

-            XferModule xferManager = new XferModule();

-            xferManager.Initialise(scene);

-            scene.AddModule(xferManager.GetName(), xferManager);

-            LoadedModules.Add(xferManager);

+            IRegionModule module  = new XferModule();

+            InitialiseModule(module, scene);

 

-            ChatModule chatModule = new ChatModule();

-            chatModule.Initialise(scene);

-            scene.AddModule(chatModule.GetName(), chatModule);

-            LoadedModules.Add(chatModule);

-

-            AvatarProfilesModule avatarProfiles = new AvatarProfilesModule();

-            avatarProfiles.Initialise(scene);

-            scene.AddModule(avatarProfiles.GetName(), avatarProfiles);

-            LoadedModules.Add(avatarProfiles);

+            module = new ChatModule();

+            InitialiseModule(module, scene);

+            

+            module = new AvatarProfilesModule();

+            InitialiseModule(module, scene);

 

             this.LoadRegionModule("OpenSim.Region.ExtensionsScriptModule.dll", "ExtensionsScriptingModule", scene);

 

             string lslPath = System.IO.Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");

             this.LoadRegionModule(lslPath, "LSLScriptingModule", scene);

+

         }

 

+

         public void LoadDefaultSharedModules(string exceptModules)

         {

             DynamicTextureModule dynamicModule = new DynamicTextureModule();

@@ -64,6 +60,13 @@ namespace OpenSim.Region.Environment
             }

         }

 

+        private void InitialiseModule(IRegionModule module, Scene scene)

+        {

+            module.Initialise(scene);

+            scene.AddModule(module.GetName(), module);

+            LoadedModules.Add(module);

+        }

+

         /// <summary>

         ///  Loads/initialises a Module instance that can be used by mutliple Regions

         /// </summary>

@@ -84,9 +87,7 @@ namespace OpenSim.Region.Environment
             IRegionModule module = this.LoadModule(dllName, moduleName);

             if (module != null)

             {

-                module.Initialise(scene);

-                scene.AddModule(module.GetName(), module);

-                LoadedModules.Add(module);

+                this.InitialiseModule(module, scene);

             }

         }

 

diff --git a/OpenSim/Region/Environment/Modules/XferModule.cs b/OpenSim/Region/Environment/Modules/XferModule.cs
index eec9f97..44b4d7a 100644
--- a/OpenSim/Region/Environment/Modules/XferModule.cs
+++ b/OpenSim/Region/Environment/Modules/XferModule.cs
@@ -10,7 +10,7 @@ using OpenSim.Region.Environment.Interfaces;
 

 namespace OpenSim.Region.Environment.Modules

 {

-    public class XferModule : IRegionModule

+    public class XferModule : IRegionModule, IXfer

     {

         public Dictionary<string, byte[]> NewFiles = new Dictionary<string, byte[]>();

         public Dictionary<ulong, XferDownLoad> Transfers = new Dictionary<ulong, XferDownLoad>();

@@ -27,7 +27,7 @@ namespace OpenSim.Region.Environment.Modules
             m_scene = scene;

             m_scene.EventManager.OnNewClient += NewClient;

 

-            m_scene.RegisterAPIMethod("API_AddXferFile", new ModuleAPIMethod2<bool, string, byte[]>(this.AddNewFile));

+            m_scene.RegisterModuleInterface<IXfer>(this);

         }

 

         public void PostInitialise()

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index e5ab41f..70b34cf 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -201,9 +201,9 @@ namespace OpenSim.Region.Environment.Scenes
                         bool fileChange = ((SceneObjectGroup)ent).GetPartInventoryFileName(remoteClient, primLocalID);

                         if (fileChange)

                         {

-                            if (this.AddXferFile != null)

+                            if (this.XferManager != null)

                             {

-                                ((SceneObjectGroup)ent).RequestInventoryFile(primLocalID, AddXferFile);

+                                ((SceneObjectGroup)ent).RequestInventoryFile(primLocalID, XferManager);

                             }

                         }

                         break;

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1af41be..d0edcda 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -91,10 +91,9 @@ namespace OpenSim.Region.Environment.Scenes
         public Dictionary<Type, object> ModuleInterfaces = new Dictionary<Type, object>();
         protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>();
 
-        //API method Delegates and interfaces
+        //API module interfaces
 
-        // this most likely shouldn't be handled as a API method like this, but doing it for testing purposes
-        public ModuleAPIMethod2<bool, string, byte[]> AddXferFile = null;
+        public IXfer XferManager;
 
         private IHttpRequests m_httpRequestModule = null;
         private ISimChat m_simChatModule = null;
@@ -206,8 +205,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_simChatModule = this.RequestModuleInterface<ISimChat>();
             m_httpRequestModule = this.RequestModuleInterface<IHttpRequests>();
 
-            //should change so it uses the module interface functions
-            AddXferFile = (ModuleAPIMethod2<bool, string, byte[]>)this.RequestAPIMethod("API_AddXferFile");
+            XferManager = this.RequestModuleInterface<IXfer>();
         }
 
         #region Script Handling Methods
@@ -605,7 +603,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (!Entities.ContainsKey(sceneObject.UUID))
             {
-                QuadTree.AddObject(sceneObject);
+              //  QuadTree.AddObject(sceneObject);
                 Entities.Add(sceneObject.UUID, sceneObject);
             }
         }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 45d975c..eff622a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -11,6 +11,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Region.Physics.Manager;
 using OpenSim.Framework.Data;
+using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -676,12 +677,12 @@ namespace OpenSim.Region.Environment.Scenes
             return false;
         }
 
-        public string RequestInventoryFile(uint localID, ModuleAPIMethod2<bool, string, byte[]> addXferFile)
+        public string RequestInventoryFile(uint localID, IXfer xferManager)
         {
             SceneObjectPart part = this.GetChildPart(localID);
             if (part != null)
             {
-                 part.RequestInventoryFile(addXferFile);
+                 part.RequestInventoryFile(xferManager);
             }
             return "";
         }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 9e207c8..2122a4f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -12,6 +12,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Region.Environment.Scenes.Scripting;
 using OpenSim.Framework.Utilities;
 using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -494,7 +495,7 @@ namespace OpenSim.Region.Environment.Scenes
             return false;
         }
 
-        public string RequestInventoryFile(ModuleAPIMethod2<bool, string, byte[]> addXferFile)
+        public string RequestInventoryFile(IXfer xferManager)
         {
             byte[] fileData = new byte[0];
             InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, this.UUID);
@@ -528,7 +529,7 @@ namespace OpenSim.Region.Environment.Scenes
             fileData = Helpers.StringToField(invString.BuildString);
             if (fileData.Length > 2)
             {
-                addXferFile(m_inventoryFileName, fileData);
+                xferManager.AddNewFile(m_inventoryFileName, fileData);
             }
             return "";
         }
diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Environment/Types/UpdateQueue.cs
index d7eb6ee..dab4258 100644
--- a/OpenSim/Region/Environment/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Environment/Types/UpdateQueue.cs
@@ -12,10 +12,43 @@ namespace OpenSim.Region.Environment.Types
 

         private List<LLUUID> m_ids;

 

+        public int Count

+        {

+            get { return m_queue.Count; }

+        }

+

         public UpdateQueue()

         {

             m_queue = new Queue<SceneObjectPart>();

             m_ids = new List<LLUUID>();

         }

+

+        public void Enqueue(SceneObjectPart part)

+        {

+            lock (m_ids)

+            {

+                if (!m_ids.Contains(part.UUID))

+                {

+                    m_ids.Add(part.UUID);

+                    m_queue.Enqueue(part);

+                }

+            }

+        }

+

+        public SceneObjectPart Dequeue()

+        {

+            SceneObjectPart part = null;

+            if (m_queue.Count > 0)

+            {

+                part = m_queue.Dequeue();

+                lock (m_ids)

+                {

+                    m_ids.Remove(part.UUID);

+                }

+            }

+

+            return part;

+        }

+    

     }

 }