16 files changed, 145 insertions, 69 deletions

diff --git a/OpenSim/OpenSim.Region/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
index 77f8854..db5070d 100644
--- a/OpenSim/OpenSim.Region/Scenes/Entity.cs
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -32,7 +32,7 @@ using Axiom.MathLib;
 using OpenSim.Physics.Manager;

 using libsecondlife;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public abstract class Entity

     {

diff --git a/OpenSim/OpenSim.Region/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
index 65077e6..36023d0 100644
--- a/OpenSim/OpenSim.Region/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
@@ -7,7 +7,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public interface IScenePresenceBody

     {

diff --git a/OpenSim/OpenSim.Region/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index e04c711..0f649b2 100644
--- a/OpenSim/OpenSim.Region/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -36,7 +36,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public class Primitive : Entity

     {

@@ -174,9 +174,9 @@ namespace OpenSim.Region.Scenes
             dataArrays.Add(primData.ToBytes());

             foreach (Entity child in children)

             {

-                if (child is OpenSim.Region.Scenes.Primitive)

+                if (child is OpenSim.Region.Environment.Scenes.Primitive)

                 {

-                    dataArrays.Add(((OpenSim.Region.Scenes.Primitive)child).GetByteArray());

+                    dataArrays.Add(((OpenSim.Region.Environment.Scenes.Primitive)child).GetByteArray());

                 }

             }

             byte[] primstart = Helpers.StringToField("<Prim>");

diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index d1a2717..1d55c4d 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;

 using OpenSim.Framework.Utilities;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public partial class Scene

     {

@@ -218,7 +218,7 @@ namespace OpenSim.Region.Scenes
             {

                 if (ent.LocalId == primLocalID)

                 {

-                    ((OpenSim.Region.Scenes.Primitive)ent).GetProperites(remoteClient);

+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);

                     break;

                 }

             }

@@ -266,7 +266,7 @@ namespace OpenSim.Region.Scenes
             {

                 if (ent.LocalId == localID)

                 {

-                    ((OpenSim.Region.Scenes.Primitive)ent).UpdatePosition(pos);

+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).UpdatePosition(pos);

                     break;

                 }

             }

diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f7d90fa..8c912d0 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -39,18 +39,20 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

 using OpenSim.Framework;

-using OpenSim.Terrain;

-using OpenGrid.Framework.Communications;

-using OpenSim.Caches;

-using OpenSim.Region;

-using OpenSim.Servers;

-using OpenSim.Scripting;

-

-namespace OpenSim.Region.Scenes

+using OpenSim.Region.Terrain;

+using OpenSim.Framework.Communications;

+using OpenSim.Region.Caches;

+using OpenSim.Region.Environment;

+using OpenSim.Framework.Servers;

+using OpenSim.Region.Enviorment.Scripting;

+using OpenSim.Region.Capabilities;

+using Caps = OpenSim.Region.Capabilities.Caps;

+

+namespace OpenSim.Region.Environment.Scenes

 {

     public delegate bool FilterAvatarList(ScenePresence avatar);

 

-    public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI

+    public partial class Scene : SceneBase, ILocalStorageReceiver

     {

         protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();

         protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars;

@@ -66,7 +68,7 @@ namespace OpenSim.Region.Scenes
         protected RegionCommsListener regionCommsHost;

         protected CommunicationsManager commsManager;

 

-        protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();

+        protected Dictionary<LLUUID,Caps> capsHandlers = new Dictionary<LLUUID, Caps>();

         protected BaseHttpServer httpListener;

 

         public ParcelManager parcelManager;

@@ -503,6 +505,7 @@ namespace OpenSim.Region.Scenes
             remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;

            //remoteClient.OnObjectSelect += this.SelectPrim;

             remoteClient.OnGrapUpdate += this.MoveObject;

+            remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;

 

             /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);

             remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);

@@ -510,7 +513,7 @@ namespace OpenSim.Region.Scenes
             remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);

             remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);

             */

-

+            

             ScenePresence newAvatar = null;

             try

             {

diff --git a/OpenSim/OpenSim.Region/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 5275fcf..50d3b82 100644
--- a/OpenSim/OpenSim.Region/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -37,10 +37,10 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

-using OpenSim.Terrain;

-using OpenSim.Caches;

+using OpenSim.Region.Terrain;

+using OpenSim.Region.Caches;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public abstract class SceneBase :  IWorld 

     {

diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
new file mode 100644
index 0000000..fa1bacb
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -0,0 +1,52 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Region.Environment.Scenes

+{

+    /// <summary>

+    /// A class for triggering remote scene events.

+    /// </summary>

+    public class EventManager

+    {

+        public delegate void OnFrameDelegate();

+        public event OnFrameDelegate OnFrame;

+

+        public delegate void OnNewPresenceDelegate(ScenePresence presence);

+        public event OnNewPresenceDelegate OnNewPresence;

+

+        public delegate void OnNewPrimitiveDelegate(Primitive prim);

+        public event OnNewPrimitiveDelegate OnNewPrimitive;

+

+        public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);

+        public event OnRemovePresenceDelegate OnRemovePresence;

+

+        public void TriggerOnFrame()

+        {

+            if (OnFrame != null)

+            {

+                OnFrame();

+            }

+        }

+

+        public void TriggerOnNewPrimitive(Primitive prim)

+        {

+            if (OnNewPrimitive != null)

+                OnNewPrimitive(prim);

+        }

+

+        public void TriggerOnNewPresence(ScenePresence presence)

+        {

+            if (OnNewPresence != null)

+                OnNewPresence(presence);

+        }

+

+        public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)

+        {

+            if (OnRemovePresence != null)

+            {

+                OnRemovePresence(uuid);

+            }

+        }

+    }

+}

diff --git a/OpenSim/OpenSim.Region/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 5df87bf..88fb160 100644
--- a/OpenSim/OpenSim.Region/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -35,7 +35,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public class SceneObject : Entity

     {

diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index f0a8721..2caabc2 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -31,7 +31,7 @@ using System.Text;
 using libsecondlife;

 using System.Xml;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     partial class ScenePresence

     {

@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes
 

                 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");

 

-                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID)

+                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)

                 {

                     AnimsNames.Add(kp.Value, kp.Key);

                 }

diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
index d21b11f..2c81d2a 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
@@ -34,7 +34,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     partial class ScenePresence

     {

diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 45d3fed..b90004e 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using Axiom.MathLib;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public partial class ScenePresence : Entity

     {

@@ -66,6 +66,17 @@ namespace OpenSim.Region.Scenes
 

         protected RegionInfo m_regionInfo;

 

+        private Vector3[] Dir_Vectors = new Vector3[6];

+        private enum Dir_ControlFlags

+        {

+            DIR_CONTROL_FLAG_FOWARD = MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS,

+            DIR_CONTROL_FLAG_BACK = MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG,

+            DIR_CONTROL_FLAG_LEFT = MainAvatar.ControlFlags.AGENT_CONTROL_LEFT_POS,

+            DIR_CONTROL_FLAG_RIGHT = MainAvatar.ControlFlags.AGENT_CONTROL_LEFT_NEG,

+            DIR_CONTROL_FLAG_UP = MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS,

+            DIR_CONTROL_FLAG_DOWN = MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG

+        }

+

         #region Properties

         /// <summary>

         /// 

@@ -125,6 +136,13 @@ namespace OpenSim.Region.Scenes
             // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);

             //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);

 

+            Dir_Vectors[0] = new Vector3(1, 0, 0);  //FOWARD

+            Dir_Vectors[1] = new Vector3(-1, 0, 0); //BACK

+            Dir_Vectors[2] = new Vector3(0, 1, 0);  //LEFT

+            Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT

+            Dir_Vectors[4] = new Vector3(0, 0, 1);  //UP

+            Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN

+

         }

         #endregion

 

@@ -216,40 +234,46 @@ namespace OpenSim.Region.Scenes
         /// </summary>

         /// <param name="pack"></param>

         public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)

-        {  

-            if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)

+        {

+            int i = 0;

+            bool update_movementflag = false;

+            bool update_rotation = false;

+            bool DCFlagKeyPressed = false;

+            Vector3 agent_control_v3 = new Vector3(0, 0, 0);

+            Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);

+

+            this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);

+

+            if (q != this.bodyRot)

             {

-                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);

-                if (((movementflag & 1) == 0) || (q != this.bodyRot))

-                {

-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);

-                    this.AddNewMovement(v3, q);

-                    movementflag = 1;

-                    this.bodyRot = q;

-                }

+                this.bodyRot = q;

+                update_rotation = true;

             }

-            else if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)

+            foreach (Dir_ControlFlags DCF in Enum.GetValues(typeof(Dir_ControlFlags)))

             {

-                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);

-                if (((movementflag & 2) == 0) || (q != this.bodyRot))

-                {  

-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);

-                    this.AddNewMovement(v3, q);

-                    movementflag = 2;

-                    this.bodyRot = q;

+                if ((flags & (uint)DCF) != 0)

+                {

+                    DCFlagKeyPressed = true;

+                    agent_control_v3 += Dir_Vectors[i];

+                    if ((movementflag & (uint)DCF) == 0)

+                    {

+                        movementflag += (byte)(uint)DCF;

+                        update_movementflag = true;

+                    }

                 }

-            }

-            else

-            {

-                if ((movementflag) != 0)

+                else

                 {

-                    NewForce newVelocity = new NewForce();

-                    newVelocity.X = 0;

-                    newVelocity.Y = 0;

-                    newVelocity.Z = 0;

-                    this.forcesList.Add(newVelocity);

-                    movementflag = 0;

+                    if ((movementflag & (uint)DCF) != 0)

+                    {

+                        movementflag -= (byte)(uint)DCF;

+                        update_movementflag = true;

+                    }

                 }

+                i++;

+            }

+            if ((update_movementflag) || (update_rotation && DCFlagKeyPressed))

+            {

+                this.AddNewMovement(agent_control_v3, q);

             }

 

         }

diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
index 870303f..a232b65 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/CSharpScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
 using System.CodeDom.Compiler;

 using Microsoft.CSharp;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     public class CSharpScriptEngine : IScriptCompiler

     {

diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
index ffae1d7..2d44223 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
 using System.CodeDom.Compiler;

 using Microsoft.JScript;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     public class JScriptEngine : IScriptCompiler

     {

diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
index 56bd1db..1e64675 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -31,10 +31,10 @@ using System.Text;
 

 using OpenSim.Framework.Console;

 using OpenSim.Framework;

-using OpenSim.Region;

-using OpenSim.Region.Scenes;

+using OpenSim.Region.Environment;

+using OpenSim.Region.Environment.Scenes;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     public interface IScript

     {

@@ -54,7 +54,7 @@ namespace OpenSim.Scripting
         public void Initialise(ScriptInfo scriptInfo)

         {

             script = scriptInfo;

-            script.events.OnFrame += new OpenSim.Region.Scenes.EventManager.OnFrameDelegate(events_OnFrame);

+            script.events.OnFrame += new OpenSim.Region.Environment.Scenes.EventManager.OnFrameDelegate(events_OnFrame);

             script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence);

         }

 

diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
index cf627dd..522a572 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptInfo.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -29,10 +29,10 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-using OpenSim.Region.Scenes;

+using OpenSim.Region.Environment.Scenes;

 using OpenSim.Framework.Console;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     /// <summary>

     /// Class which provides access to the world

diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index abffffa..eb1c1d9 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -29,12 +29,12 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     public class ScriptManager

     {

         List<IScript> scripts = new List<IScript>();

-        OpenSim.Region.Scenes.Scene scene;

+        OpenSim.Region.Environment.Scenes.Scene scene;

         Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();

 

         private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts)

@@ -49,7 +49,7 @@ namespace OpenSim.Scripting
             OpenSim.Framework.Console.MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");

         }

 

-        public ScriptManager(OpenSim.Region.Scenes.Scene world)

+        public ScriptManager(OpenSim.Region.Environment.Scenes.Scene world)

         {

             scene = world;

 

@@ -59,9 +59,6 @@ namespace OpenSim.Scripting
 

             JScriptEngine jscriptCompiler = new JScriptEngine();

             compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);

-

-            JSharpScriptEngine jsharpCompiler = new JSharpScriptEngine();

-            compilers.Add(jsharpCompiler.FileExt(), jsharpCompiler);

         }

 

         public void Compile(string filename)