13 files changed, 220 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
index 5d7e6a6..21a7e61 100644
--- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
@@ -38,6 +38,11 @@ namespace OpenSim.Region.Environment.Modules
             return "AssetDownloadModule";

         }

 

+        public bool IsSharedModule()

+        {

+            return false;

+        }

+

         public void NewClient(IClientAPI client)

         {

         }

diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
index 1427c58..1ad061a 100644
--- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
@@ -39,11 +39,21 @@ namespace OpenSim.Region.Environment.Modules
             return "AvatarProfilesModule";

         }

 

+        public bool IsSharedModule()

+        {

+            return false;

+        }

+

         public void NewClient(IClientAPI client)

         {

             client.OnRequestAvatarProperties += RequestAvatarProperty;

         }

 

+        public void RemoveClient(IClientAPI client)

+        {

+            client.OnRequestAvatarProperties -= RequestAvatarProperty;

+        }

+

         /// <summary>

         /// 

         /// </summary>

diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 752cde4..ac91b78 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -14,7 +14,7 @@ using OpenSim.Framework.Console;
 

 namespace OpenSim.Region.Environment.Modules

 {

-    public class ChatModule : IRegionModule

+    public class ChatModule : IRegionModule, ISimChat

     {

         private Scene m_scene;

 

@@ -45,11 +45,12 @@ namespace OpenSim.Region.Environment.Modules
             m_scene = scene;

             m_scene.EventManager.OnNewClient += NewClient;

 

-            //should register a optional API Method, so other modules can send chat messages using this module

+            m_scene.RegisterModuleInterface<ISimChat>(this);

         }

 

         public void PostInitialise()

         {

+            /*

             try

             {

                 m_irc = new TcpClient(m_server, m_port);

@@ -75,6 +76,7 @@ namespace OpenSim.Region.Environment.Modules
             {

                 Console.WriteLine(e.ToString());

             }

+            */

         }

 

         public void CloseDown()

@@ -89,6 +91,11 @@ namespace OpenSim.Region.Environment.Modules
             return "ChatModule";

         }

 

+        public bool IsSharedModule()

+        {

+            return false;

+        }

+

         public void NewClient(IClientAPI client)

         {

             client.OnChatFromViewer += SimChat;

diff --git a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
new file mode 100644
index 0000000..6edebe7
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
@@ -0,0 +1,136 @@
+using System.Text;

+using System.Net;

+using System.Net.Sockets;

+using System.Threading;

+using System.IO;

+using System.Collections.Generic;

+using libsecondlife;

+using OpenJPEGNet;

+using OpenSim.Region.Environment.Scenes;

+using OpenSim.Region.Environment.Interfaces;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Utilities;

+using OpenSim.Framework.Console;

+using OpenSim.Framework.Types;

+

+namespace OpenSim.Region.Environment.Modules

+{

+    public class DynamicTextureModule :IRegionModule, IDynamicTextureManager

+    {

+        private Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>();

+        private Dictionary<string, IDynamicTextureRender> RenderPlugins= new Dictionary<string, IDynamicTextureRender>();

+        private Dictionary<LLUUID, DynamicTextureUpdater> Updaters = new Dictionary<LLUUID, DynamicTextureUpdater>();

+

+        public void Initialise(Scene scene)

+        {

+            if (!RegisteredScenes.ContainsKey(scene.RegionInfo.SimUUID))

+            {

+                RegisteredScenes.Add(scene.RegionInfo.SimUUID, scene);

+                scene.RegisterModuleInterface<IDynamicTextureManager>(this);

+            }

+        }

+

+        public void PostInitialise()

+        {

+           

+        }

+

+        public void CloseDown()

+        {

+        }

+

+        public string GetName()

+        {

+            return "DynamicTextureModule";

+        }

+

+        public bool IsSharedModule()

+        {

+            return true;

+        }

+

+        public void RegisterRender(string handleType, IDynamicTextureRender render)

+        {

+            if (!RenderPlugins.ContainsKey(handleType))

+            {

+                RenderPlugins.Add(handleType, render);

+            }

+        }

+

+        public void ReturnData(LLUUID id, byte[] data)

+        {

+            if (Updaters.ContainsKey(id))

+            {

+                DynamicTextureUpdater updater = Updaters[id];

+                if (RegisteredScenes.ContainsKey(updater.SimUUID))

+                {

+                    Scene scene = RegisteredScenes[updater.SimUUID];

+                    updater.DataReceived(data, scene);

+                }

+            }

+        }

+

+        public LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, string extraParams, int updateTimer)

+        {

+            System.Console.WriteLine("dynamic texture being created " + url + " of type " + contentType);

+            if (this.RenderPlugins.ContainsKey(contentType))

+            {

+                DynamicTextureUpdater updater = new DynamicTextureUpdater();

+                updater.SimUUID = simID;

+                updater.PrimID = primID;

+                updater.ContentType = contentType;

+                updater.Url = url;

+                updater.UpdateTimer = updateTimer;

+                updater.UpdaterID = LLUUID.Random();

+                updater.Params = extraParams;

+

+                if (!this.Updaters.ContainsKey(updater.UpdaterID))

+                {

+                    Updaters.Add(updater.UpdaterID, updater);

+                }

+

+                RenderPlugins[contentType].AsyncConvertUrl(updater.UpdaterID, url, extraParams);

+                return updater.UpdaterID;

+            }

+            return LLUUID.Zero;

+        }

+

+        public class DynamicTextureUpdater

+        {

+            public LLUUID SimUUID;

+            public LLUUID UpdaterID;

+            public string ContentType;

+            public string Url;

+            public Stream StreamData;

+            public LLUUID PrimID;

+            public int UpdateTimer;

+            public LLUUID LastAssetID;

+            public string Params;

+

+            public DynamicTextureUpdater()

+            {

+                LastAssetID = LLUUID.Zero;

+                UpdateTimer = 0;

+                StreamData = null;

+            }

+

+            public void DataReceived(byte[] data, Scene scene)

+            {

+                //TODO delete the last asset(data), if it was a dynamic texture

+ 

+                AssetBase asset = new AssetBase();

+                asset.FullID = LLUUID.Random();

+                asset.Data = data;

+                asset.Name = "DynamicImage" + Util.RandomClass.Next(1, 10000);

+                asset.Type = 0;

+                scene.commsManager.AssetCache.AddAsset(asset);

+

+                this.LastAssetID = asset.FullID;

+

+                SceneObjectPart part = scene.GetSceneObjectPart(PrimID);

+                part.Shape.TextureEntry = new LLObject.TextureEntry(asset.FullID).ToBytes();

+                part.ScheduleFullUpdate();

+            }

+        }

+    }

+}

diff --git a/OpenSim/Region/Environment/Modules/EmailModule.cs b/OpenSim/Region/Environment/Modules/EmailModule.cs
new file mode 100644
index 0000000..2a90dd3
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/EmailModule.cs
@@ -0,0 +1,10 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Region.Environment.Modules

+{

+    class EmailModule

+    {

+    }

+}

diff --git a/OpenSim/Region/Environment/Modules/FriendsModule.cs b/OpenSim/Region/Environment/Modules/FriendsModule.cs
index f952bb2..d46039c 100644
--- a/OpenSim/Region/Environment/Modules/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/FriendsModule.cs
@@ -31,5 +31,10 @@ namespace OpenSim.Region.Environment.Modules
         {

             return "FriendsModule";

         }

+

+        public bool IsSharedModule()

+        {

+            return false;

+        }

     }

 }

diff --git a/OpenSim/Region/Environment/Modules/GroupsModule.cs b/OpenSim/Region/Environment/Modules/GroupsModule.cs
index 607b395..8e4b409 100644
--- a/OpenSim/Region/Environment/Modules/GroupsModule.cs
+++ b/OpenSim/Region/Environment/Modules/GroupsModule.cs
@@ -30,6 +30,11 @@ namespace OpenSim.Region.Environment.Modules
         {

             return "GroupsModule";

         }

+

+        public bool IsSharedModule()

+        {

+            return false;

+        }

     }

 }

 

diff --git a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
index 9c09c48..acf031b 100644
--- a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
@@ -31,5 +31,10 @@ namespace OpenSim.Region.Environment.Modules
         {

             return "InstantMessageModule";

         }

+

+        public bool IsSharedModule()

+        {

+            return false;

+        }

     }

 }

diff --git a/OpenSim/Region/Environment/Modules/InventoryModule.cs b/OpenSim/Region/Environment/Modules/InventoryModule.cs
index 94e7ba7..00b4d8e 100644
--- a/OpenSim/Region/Environment/Modules/InventoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/InventoryModule.cs
@@ -31,5 +31,10 @@ namespace OpenSim.Region.Environment.Modules
         {

             return "InventoryModule";

         }

+

+        public bool IsSharedModule()

+        {

+            return false;

+        }

     }

 }

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

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Region.Environment.Modules

+{

+    class ScriptsHttpRequests

+    {

+    }

+}

diff --git a/OpenSim/Region/Environment/Modules/TeleportModule.cs b/OpenSim/Region/Environment/Modules/TeleportModule.cs
new file mode 100644
index 0000000..08fc202
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/TeleportModule.cs
@@ -0,0 +1,10 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Region.Environment.Modules

+{

+    class TeleportModule

+    {

+    }

+}

diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index a92566d..7d31644 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -37,6 +37,11 @@ namespace OpenSim.Region.Environment.Modules
             return "TextureDownloadModule";

         }

 

+        public bool IsSharedModule()

+        {

+            return false;

+        }

+

         public void NewClient(IClientAPI client)

         {

         }

diff --git a/OpenSim/Region/Environment/Modules/XferModule.cs b/OpenSim/Region/Environment/Modules/XferModule.cs
index a0327e9..eec9f97 100644
--- a/OpenSim/Region/Environment/Modules/XferModule.cs
+++ b/OpenSim/Region/Environment/Modules/XferModule.cs
@@ -45,6 +45,11 @@ namespace OpenSim.Region.Environment.Modules
             return "XferModule";

         }

 

+        public bool IsSharedModule()

+        {

+            return false;

+        }

+

         public void NewClient(IClientAPI client)

         {

             client.OnRequestXfer += RequestXfer;