Hijacked simpleApp again (sorry lbsa71, guess I should create my own simpleApp), to try out a basic test npc character(/class).

3 files changed, 8 insertions, 6 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 1445edf..6431bc7 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -139,8 +139,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="fromAgentID"></param>

         public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)

         {

-            // Console.WriteLine("Chat message");

-            ScenePresence avatar = null;

+             ScenePresence avatar = null;

             if (this.Avatars.ContainsKey(fromAgentID))

             {

                 avatar = this.Avatars[fromAgentID];

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a06679a..bb9fa61 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -55,8 +55,8 @@ namespace OpenSim.Region.Environment.Scenes
         protected Timer m_heartbeatTimer = new Timer();

         protected Dictionary<LLUUID, ScenePresence> Avatars;

         protected Dictionary<LLUUID, SceneObject> Prims;

-        private PhysicsScene phyScene;

-        private float timeStep = 0.1f;

+        protected PhysicsScene phyScene;

+        protected float timeStep = 0.1f;

         private Random Rand = new Random();

         private uint _primCount = 702000;

         private System.Threading.Mutex _primAllocateMutex = new Mutex(false);

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 6966989..3558ca3 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -57,7 +57,10 @@ namespace OpenSim.Region.Environment.Scenes
         private byte[] visualParams;

         private AvatarWearable[] Wearables;

         private ulong m_regionHandle;

-        private bool childAgent = false;

+

+        public bool childAgent = false;

+        public bool IsRestrictedToRegion = false;

+

         private bool newForce = false;

         private bool newAvatar = false;

         private IScenePresenceBody m_body;

@@ -72,7 +75,7 @@ namespace OpenSim.Region.Environment.Scenes
             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

+            DIR_CONTROL_FLAG_DOWN = MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG

         }

         /// <summary>

         /// Position at which a significant movement was made