4 files changed, 73 insertions, 19 deletions

diff --git a/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim.RegionServer/world/scripting/IScriptContext.cs
index 80878ef..465c23b 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptContext.cs
+++ b/OpenSim.RegionServer/world/scripting/IScriptContext.cs
@@ -7,7 +7,7 @@ namespace OpenSim.RegionServer.world.scripting
 {

     public interface IScriptContext

     {

-        bool MoveTo(LLVector3 newPos);

-        LLVector3 GetPos();

+        IScriptEntity Entity { get; }

+        bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);

     }

 }

diff --git a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
new file mode 100644
index 0000000..2ef16a4
--- /dev/null
+++ b/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
@@ -0,0 +1,19 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using libsecondlife;

+

+namespace OpenSim.RegionServer.world.scripting

+{

+    public interface IScriptReadonlyEntity

+    {

+        LLVector3 Pos { get; }

+        string Name { get; }

+    }

+    

+    public interface IScriptEntity

+    {

+        LLVector3 Pos { get; set; }

+        string Name { get; }

+    }

+}

diff --git a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
index 5addb35..15efc49 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
+++ b/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
@@ -4,18 +4,19 @@ using System.Text;
 using libsecondlife;

 using OpenSim.Physics.Manager;

 using OpenSim.world;

-using Primitive=OpenSim.world.Primitive;

+using Avatar=OpenSim.world.Avatar;

+using Primitive = OpenSim.world.Primitive;

 

 namespace OpenSim.RegionServer.world.scripting

 {

-    public delegate void ScriptEventHandler( IScriptContext context );

-    

-    public class ScriptHandler : IScriptContext

+    public delegate void ScriptEventHandler(IScriptContext context);

+

+    public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity

     {

         private World m_world;

         private Script m_script;

         private Entity m_entity;

-        

+

         public LLUUID ScriptId

         {

             get

@@ -23,13 +24,13 @@ namespace OpenSim.RegionServer.world.scripting
                 return m_script.ScriptId;

             }

         }

-        

+

         public void OnFrame()

         {

             m_script.OnFrame(this);

         }

 

-        public ScriptHandler( Script script, Entity entity, World world )

+        public ScriptHandler(Script script, Entity entity, World world)

         {

             m_script = script;

             m_entity = entity;

@@ -38,22 +39,57 @@ namespace OpenSim.RegionServer.world.scripting
 

         #region IScriptContext Members

 

-        bool IScriptContext.MoveTo(LLVector3 newPos)

+        IScriptEntity IScriptContext.Entity

+        {

+            get

+            {

+                return this;

+            }

+        }

+

+        bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)

         {

-            if (m_entity is Primitive)

+            foreach (Entity entity in m_world.Entities.Values )

             {

-                Primitive prim = m_entity as Primitive;

-                // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.

-                prim.UpdatePosition( newPos );

-                return true;

+                if( entity is Avatar )

+                {

+                    avatar = entity;

+                    return true;

+                }

             }

             

+            avatar = null;

             return false;

         }

 

-        LLVector3 IScriptContext.GetPos()

+        #endregion

+

+        #region IScriptEntity and IScriptReadonlyEntity Members

+

+        public string Name

+        {

+            get

+            {

+                return m_entity.Name;

+            }

+        }

+

+        public LLVector3 Pos

         {

-            return m_entity.position;

+            get

+            {

+                return m_entity.Pos;

+            }

+

+            set

+            {

+                if (m_entity is Primitive)

+                {

+                    Primitive prim = m_entity as Primitive;

+                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.

+                    prim.UpdatePosition( value );

+                }

+            }

         }

 

         #endregion

diff --git a/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim.RegionServer/world/scripting/Script.cs
index 3997b41..48c18ff 100644
--- a/OpenSim.RegionServer/world/scripting/Script.cs
+++ b/OpenSim.RegionServer/world/scripting/Script.cs
@@ -7,8 +7,7 @@ namespace OpenSim.RegionServer.world.scripting
 {

     public class Script

     {

-        private LLUUID m_scriptId;

-        

+        private LLUUID m_scriptId;        

         public virtual LLUUID ScriptId

         {

             get