* Adds World.Avatars[] to MRM Scripting. Contains an enumerable array containing IAvatar instances for each avatar in the region.

* Adds Test/TestModule.cs which demonstrates a very quick and simple MRM Test.

5 files changed, 73 insertions, 1 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IAvatar.cs
index e979378..a500154 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IAvatar.cs
@@ -32,7 +32,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
-    interface IAvatar
+    public interface IAvatar
     {
         string Name { get; }
         UUID GlobalID { get; }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IWorld.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IWorld.cs
index 63fdc74..bfa6b65 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IWorld.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IWorld.cs
@@ -34,6 +34,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
     public interface IWorld
     {
         IObject[] Objects { get; }
+        IAvatar[] Avatars { get; }
         IHeightmap Terrain { get; }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
new file mode 100644
index 0000000..6011e0b
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -0,0 +1,37 @@
+using OpenMetaverse;

+using OpenSim.Region.Framework.Scenes;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    class SPAvatar : IAvatar

+    {

+        private readonly Scene m_rootScene;

+        private readonly UUID m_ID;

+

+        public SPAvatar(Scene scene, UUID ID)

+        {

+            m_rootScene = scene;

+            m_ID = ID;

+        }

+

+        private ScenePresence GetSP()

+        {

+            return m_rootScene.GetScenePresence(m_ID);

+        }

+

+        public string Name

+        {

+            get { return GetSP().Name; }

+        }

+

+        public UUID GlobalID

+        {

+            get { return m_ID; }

+        }

+

+        public Vector3 Position

+        {

+            get { return GetSP().AbsolutePosition; }

+        }

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs
new file mode 100644
index 0000000..abbef0b
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs
@@ -0,0 +1,17 @@
+using OpenSim.Region.OptionalModules.Scripting.Minimodule;

+

+namespace OpenSim

+{

+    class MiniModule : MRMBase

+    {

+        public override void Start()

+        {

+            Host.Console.Info("Hello World!");

+        }

+

+        public override void Stop()

+        {

+            

+        }

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
index cdefe16..4ba6778 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
@@ -58,6 +58,23 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             }
         }
 
+        public IAvatar[] Avatars
+        {
+            get
+            {
+                List<EntityBase> ents = m_internalScene.Entities.GetAllByType<ScenePresence>();
+                IAvatar[] rets = new IAvatar[ents.Count];
+
+                for (int i = 0; i < ents.Count; i++)
+                {
+                    EntityBase ent = ents[i];
+                    rets[i] = new SPAvatar(m_internalScene, ent.UUID);
+                }
+
+                return rets;
+            }
+        }
+
         public IHeightmap Terrain
         {
             get { return m_heights; }