Added partial help info when calling "help" command with a region set.

Added AddDynamicTextureData() to DynamicTextureModule, so that a script (or another module even) can create a dynamic texture by passing a string with the data in, rather than a url. This could be used for anything from a script passing a basic text string (and having it rendered to a texture) or the script building its own html document.

1 files changed, 26 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
index 6edebe7..3a03d48 100644
--- a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
+++ b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
@@ -95,13 +95,37 @@ namespace OpenSim.Region.Environment.Modules
             return LLUUID.Zero;

         }

 

+        public LLUUID AddDynamicTextureData(LLUUID simID, LLUUID primID, string contentType, string data, string extraParams, int updateTimer)

+        {

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

+            {

+                DynamicTextureUpdater updater = new DynamicTextureUpdater();

+                updater.SimUUID = simID;

+                updater.PrimID = primID;

+                updater.ContentType = contentType;

+                updater.BodyData = data;

+                updater.UpdateTimer = updateTimer;

+                updater.UpdaterID = LLUUID.Random();

+                updater.Params = extraParams;

+

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

+                {

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

+                }

+

+                RenderPlugins[contentType].AsyncConvertData(updater.UpdaterID, data, 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 string BodyData;

             public LLUUID PrimID;

             public int UpdateTimer;

             public LLUUID LastAssetID;

@@ -111,7 +135,7 @@ namespace OpenSim.Region.Environment.Modules
             {

                 LastAssetID = LLUUID.Zero;

                 UpdateTimer = 0;

-                StreamData = null;

+                BodyData = null;

             }

 

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