22 files changed, 107 insertions, 97 deletions
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Examples/SimpleApp/MyWorld.cs
index bc7a3b0..334b6af 100644
--- a/OpenSim/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Examples/SimpleApp/MyWorld.cs
@@ -6,7 +6,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;
 using libsecondlife;
 using OpenSim.Region;
-using Avatar=OpenSim.Region.Scenes.Avatar;
+using Avatar=OpenSim.Region.Scenes.ScenePresence;
 using OpenSim.Region.Scenes;
 using OpenSim.Framework;
 using OpenSim.Caches;
@@ -17,7 +17,7 @@ namespace SimpleApp
    public class MyWorld : Scene
    {
        private RegionInfo m_regionInfo;
-        private List<OpenSim.Region.Scenes.Avatar> m_avatars;
+        private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;
        public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach)
            : base(clientThreads, regionInfo, authen, commsMan, assetCach)
@@ -43,7 +43,8 @@ namespace SimpleApp
        #region IWorld Members
-        override public void AddNewAvatar(IClientAPI client, LLUUID agentID, bool child)
+        override public void AddNewClient(IClientAPI client, LLUUID agentID, bool child)
        {
            LLVector3 pos = new LLVector3(128, 128, 128);
            
@@ -65,7 +66,7 @@ namespace SimpleApp
            client.OnCompleteMovementToRegion += delegate()
                 {
-                     client.SendAvatarData(m_regionInfo, client.FirstName,
+                     client.SendAvatarData(m_regionInfo.RegionHandle, client.FirstName,
                                           client.LastName, client.AgentId, 0,
                                           pos);
                                                         
@@ -74,7 +75,7 @@ namespace SimpleApp
            client.SendRegionHandshake(m_regionInfo);
-            OpenSim.Region.Scenes.Avatar avatar = new Avatar( client, this, m_regionInfo );
+            OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
            
        }
@@ -83,7 +84,8 @@ namespace SimpleApp
            client.SendWearables( AvatarWearable.DefaultWearables );
        }
-        public void RemoveAvatar(LLUUID agentID)
+       override public void RemoveClient(LLUUID agentID)
        {
        }
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index b0b68d9..6d89cbe 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -19,13 +19,13 @@ namespace SimpleApp
 {
    class Program : IAssetReceiver, conscmd_callback
    {
-        private ConsoleBase m_console;
+        private LogBase m_console;
        AuthenticateSessionsBase m_circuitManager;
        
        private void Run()
        {
-            m_console = new ConsoleBase(null, "SimpleApp", this, false);
+            m_console = new LogBase(null, "SimpleApp", this, false);
-            MainConsole.Instance = m_console;
+            MainLog.Instance = m_console;
            CheckSumServer checksumServer = new CheckSumServer(12036);
            checksumServer.ServerListener();
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
index b024219..087922b 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
@@ -21,13 +21,15 @@
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenGrid.Framework.Communications.dll" />
                <include name="../../../bin/OpenSim.Caches.dll" />
                <include name="../../../bin/OpenSim.Framework.dll" />
                <include name="../../../bin/OpenSim.Framework.Console.dll" />
                <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" />
+                <include name="../../../bin/OpenSim.LocalCommunications.dll" />
+                <include name="../../../bin/OpenSim.Region.dll" />
                <include name="../../../bin/OpenSim.RegionServer.dll" />
                <include name="../../../bin/OpenSim.Servers.dll" />
-                <include name="OpenSim.World.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll.dll" />
                <include name="System.Xml.dll" />
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
index 0fe52a7..fdfdd16 100644
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
@@ -38,6 +38,6 @@ namespace OpenSim.LocalCommunications
        {
        }
+       
    }
 }
diff --git a/OpenSim/OpenSim.Region/EstateManager.cs b/OpenSim/OpenSim.Region/EstateManager.cs
index 3b918b1..fbcab33 100644
--- a/OpenSim/OpenSim.Region/EstateManager.cs
+++ b/OpenSim/OpenSim.Region/EstateManager.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.Scenes;
 using OpenSim;
 using libsecondlife;
 using libsecondlife.Packets;
-using Avatar = OpenSim.Region.Scenes.Avatar;
+using Avatar = OpenSim.Region.Scenes.ScenePresence;
 namespace OpenSim.Region
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 94efbed..a531e5c 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -142,15 +142,6 @@
    <Compile Include="ParcelManager.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\Avatar.Animations.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Avatar.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Avatar.Update.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Scenes\Entity.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -172,6 +163,15 @@
    <Compile Include="Scenes\SceneObject.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="Scenes\ScenePresence.Animations.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.Update.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="Scenes\scripting\IScriptContext.cs">
      <SubType>Code</SubType>
    </Compile>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index 6d47576..e277ec7 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -13,9 +13,6 @@
            <sources failonempty="true">
                <include name="EstateManager.cs" />
                <include name="ParcelManager.cs" />
-                <include name="Scenes/Avatar.Animations.cs" />
-                <include name="Scenes/Avatar.cs" />
-                <include name="Scenes/Avatar.Update.cs" />
                <include name="Scenes/Entity.cs" />
                <include name="Scenes/Primitive.cs" />
                <include name="Scenes/Scene.cs" />
@@ -23,6 +20,9 @@
                <include name="Scenes/Scene.Scripting.cs" />
                <include name="Scenes/SceneBase.cs" />
                <include name="Scenes/SceneObject.cs" />
+                <include name="Scenes/ScenePresence.Animations.cs" />
+                <include name="Scenes/ScenePresence.cs" />
+                <include name="Scenes/ScenePresence.Update.cs" />
                <include name="Scenes/scripting/IScriptContext.cs" />
                <include name="Scenes/scripting/IScriptEntity.cs" />
                <include name="Scenes/scripting/IScriptHandler.cs" />
diff --git a/OpenSim/OpenSim.Region/ParcelManager.cs b/OpenSim/OpenSim.Region/ParcelManager.cs
index 3b0785f..d15d77d 100644
--- a/OpenSim/OpenSim.Region/ParcelManager.cs
+++ b/OpenSim/OpenSim.Region/ParcelManager.cs
@@ -33,7 +33,7 @@ using libsecondlife.Packets;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Region.Scenes;
-using Avatar = OpenSim.Region.Scenes.Avatar;
+using Avatar = OpenSim.Region.Scenes.ScenePresence;
 namespace OpenSim.Region
 {
diff --git a/OpenSim/OpenSim.Region/Scenes/Primitive.cs b/OpenSim/OpenSim.Region/Scenes/Primitive.cs
index 929f0b5..39b3fbc 100644
--- a/OpenSim/OpenSim.Region/Scenes/Primitive.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Primitive.cs
@@ -419,7 +419,7 @@ namespace OpenSim.Region.Scenes
        /// </summary>
        public void SendFullUpdateToAllClients()
        {
-            List<Avatar> avatars = this.m_world.RequestAvatarList();
+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
            for (int i = 0; i < avatars.Count; i++)
            {
                this.SendFullUpdateToClient(avatars[i].ControllingClient);
@@ -452,7 +452,7 @@ namespace OpenSim.Region.Scenes
        /// </summary>
        public void SendTerseUpdateToALLClients()
        {
-            List<Avatar> avatars = this.m_world.RequestAvatarList();
+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
            for (int i = 0; i < avatars.Count; i++)
            {
                this.SendTerseUpdateToClient(avatars[i].ControllingClient);
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs b/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
index 35a3bda..75fe779 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Scenes
        public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
        {
            Console.WriteLine("Chat message");
-            Avatar avatar = null;
+            ScenePresence avatar = null;
            foreach (IClientAPI client in m_clientThreads.Values)
            {
                int dis = -1000;
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs b/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
index 6317e43..7b53388 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Scenes
            uint res = 0;
            foreach (Entity entity in this.Entities.Values)
            {
-                if (entity is Avatar)
+                if (entity is ScenePresence)
                {
                    res = entity.LocalId;
                }
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index ffcc0c8..74b4945 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -46,12 +46,12 @@ using OpenSim.Caches;
 namespace OpenSim.Region.Scenes
 {
-    public delegate bool FilterAvatarList(Avatar avatar);
+    public delegate bool FilterAvatarList(ScenePresence avatar);
    public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
    {
        protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
-        protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
+        protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars;
        protected Dictionary<libsecondlife.LLUUID, Primitive> Prims;
        private PhysicsScene phyScene;
        private float timeStep = 0.1f;
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes
        protected AuthenticateSessionsBase authenticateHandler;
        protected RegionCommsListener regionCommsHost;
        protected CommunicationsManager commsManager;
-        
        public ParcelManager parcelManager;
        public EstateManager estateManager;
@@ -119,14 +119,14 @@ namespace OpenSim.Region.Scenes
                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance");
                Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
-                Avatars = new Dictionary<LLUUID, Avatar>();
+                Avatars = new Dictionary<LLUUID, ScenePresence>();
                Prims = new Dictionary<LLUUID, Primitive>();
                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating LandMap");
                TerrainManager = new TerrainManager(new SecondLife());
                Terrain = new TerrainEngine();
-                
-                Avatar.LoadAnims();
+                ScenePresence.LoadAnims();
            }
            catch (Exception e)
            {
@@ -209,7 +209,7 @@ namespace OpenSim.Region.Scenes
                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
            }
            updateLock.ReleaseMutex();
-             
        }
        /// <summary>
@@ -408,6 +408,7 @@ namespace OpenSim.Region.Scenes
        /// <summary>
        /// Loads the World heightmap
        /// </summary>
+        /// 
        public override void LoadWorldMap()
        {
            try
@@ -415,16 +416,16 @@ namespace OpenSim.Region.Scenes
                float[] map = this.localStorage.LoadWorld();
                if (map == null)
                {
-                   // Console.WriteLine("creating new terrain");
+                    // Console.WriteLine("creating new terrain");
-                   // this.Terrain.hills();
+                    // this.Terrain.hills();
-                   // this.localStorage.SaveMap(this.Terrain.getHeights1D());
+                    // this.localStorage.SaveMap(this.Terrain.getHeights1D());
                    if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
                    {
                        Console.WriteLine("No default terrain, procedurally generating...");
                        this.Terrain.hills();
-                       // this.localStorage.SaveMap(this.Terrain.getHeights1D());
+                        // this.localStorage.SaveMap(this.Terrain.getHeights1D());
                    }
                    else
                    {
@@ -438,7 +439,7 @@ namespace OpenSim.Region.Scenes
                            Console.WriteLine("Unable to load default terrain, procedurally generating instead...");
                            Terrain.hills();
                        }
-                       // this.localStorage.SaveMap(this.Terrain.getHeights1D());
+                        // this.localStorage.SaveMap(this.Terrain.getHeights1D());
                    }
                }
                else
@@ -447,7 +448,7 @@ namespace OpenSim.Region.Scenes
                }
                CreateTerrainTexture();
-       
            }
            catch (Exception e)
            {
@@ -455,7 +456,6 @@ namespace OpenSim.Region.Scenes
            }
        }
        /// <summary>
        /// 
        /// </summary>
@@ -520,15 +520,19 @@ namespace OpenSim.Region.Scenes
        {
            try
            {
               // MainLog.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
                Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
-                
                this.Entities.Add(prim.uuid, prim);
                this._primCount++;
            }
            catch (Exception e)
            {
               // MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
            }
        }
@@ -542,16 +546,16 @@ namespace OpenSim.Region.Scenes
        /// <param name="remoteClient"></param          
        /// <param name="agentID"></param>
        /// <param name="child"></param>
-        public override void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)
+        public override void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child)
        {
-            remoteClient.OnRegionHandShakeReply += new GenericCall(this.SendLayerData);
+            remoteClient.OnRegionHandShakeReply += this.SendLayerData;
            //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
-            remoteClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);
+            remoteClient.OnChatFromViewer += this.SimChat;
-            remoteClient.OnRequestWearables += new GenericCall(this.InformClientOfNeighbours);
+            remoteClient.OnRequestWearables += this.InformClientOfNeighbours;
-            remoteClient.OnAddPrim += new GenericCall4(this.AddNewPrim);
+            remoteClient.OnAddPrim += this.AddNewPrim;
-            remoteClient.OnUpdatePrimPosition += new UpdatePrimVector(this.UpdatePrimPosition);
+            remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition;
-            remoteClient.OnRequestMapBlocks += new RequestMapBlocks(this.RequestMapBlocks);
+            remoteClient.OnRequestMapBlocks += this.RequestMapBlocks;
-            remoteClient.OnTeleportLocationRequest += new TeleportLocationRequest(this.RequestTeleportLocation);
+            remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
            /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
            remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
@@ -560,11 +564,12 @@ namespace OpenSim.Region.Scenes
            remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
            */
-            Avatar newAvatar = null;
+            ScenePresence newAvatar = null;
            try
            {
                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
-                newAvatar = new Avatar(remoteClient, this, this.m_regInfo);
+                newAvatar = new ScenePresence(remoteClient, this, this.m_regInfo);
                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake ");
@@ -607,13 +612,13 @@ namespace OpenSim.Region.Scenes
            return;
        }
-       
        /// <summary>
        /// 
        /// </summary>
        /// <param name="agentID"></param>
-        public override void RemoveAvatar(LLUUID agentID)
+        public override void RemoveClient(LLUUID agentID)
        {
            return;
        }
@@ -627,11 +632,11 @@ namespace OpenSim.Region.Scenes
        /// Request a List of all Avatars in this World
        /// </summary>
        /// <returns></returns>
-        public List<Avatar> RequestAvatarList()
+        public List<ScenePresence> RequestAvatarList()
        {
-            List<Avatar> result = new List<Avatar>();
+            List<ScenePresence> result = new List<ScenePresence>();
-            foreach (Avatar avatar in Avatars.Values)
+            foreach (ScenePresence avatar in Avatars.Values)
            {
                result.Add(avatar);
            }
@@ -643,11 +648,11 @@ namespace OpenSim.Region.Scenes
        /// Request a filtered list of Avatars in this World
        /// </summary>
        /// <returns></returns>
-        public List<Avatar> RequestAvatarList(FilterAvatarList filter)
+        public List<ScenePresence> RequestAvatarList(FilterAvatarList filter)
        {
-            List<Avatar> result = new List<Avatar>();
+            List<ScenePresence> result = new List<ScenePresence>();
-            foreach (Avatar avatar in Avatars.Values)
+            foreach (ScenePresence avatar in Avatars.Values)
            {
                if (filter(avatar))
                {
@@ -663,7 +668,7 @@ namespace OpenSim.Region.Scenes
        /// </summary>
        /// <param name="avatarID"></param>
        /// <returns></returns>
-        public Avatar RequestAvatar(LLUUID avatarID)
+        public ScenePresence RequestAvatar(LLUUID avatarID)
        {
            if (this.Avatars.ContainsKey(avatarID))
            {
@@ -712,7 +717,7 @@ namespace OpenSim.Region.Scenes
        /// <param name="agent"></param>
        public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
        {
-           // Console.WriteLine("World.cs - add new user connection");
+            // Console.WriteLine("World.cs - add new user connection");
            //should just check that its meant for this region 
            if (regionHandle == this.m_regInfo.RegionHandle)
            {
@@ -777,7 +782,7 @@ namespace OpenSim.Region.Scenes
        {
            List<MapBlockData> mapBlocks;
            mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
-           
            remoteClient.SendMapBlock(mapBlocks);
        }
diff --git a/OpenSim/OpenSim.Region/Scenes/SceneBase.cs b/OpenSim/OpenSim.Region/Scenes/SceneBase.cs
index 05c2aba..e650127 100644
--- a/OpenSim/OpenSim.Region/Scenes/SceneBase.cs
+++ b/OpenSim/OpenSim.Region/Scenes/SceneBase.cs
@@ -43,7 +43,7 @@ using OpenSim.Caches;
 namespace OpenSim.Region.Scenes
 {
-    public abstract class SceneBase : IWorld
+    public abstract class SceneBase :  IWorld 
    {
        public Dictionary<libsecondlife.LLUUID, Entity> Entities;
        protected Dictionary<uint, IClientAPI> m_clientThreads;
@@ -98,13 +98,13 @@ namespace OpenSim.Region.Scenes
        /// <param name="remoteClient"></param>
        /// <param name="agentID"></param>
        /// <param name="child"></param>
-        public abstract void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);
+        public abstract void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
        
        /// <summary>
        /// 
        /// </summary>
        /// <param name="agentID"></param>
-        public abstract void RemoveAvatar(LLUUID agentID);
+        public abstract void RemoveClient(LLUUID agentID);
       
        #endregion
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.Animations.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs
index cc0fb7a..f0a8721 100644
--- a/OpenSim/OpenSim.Region/Scenes/Avatar.Animations.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs
@@ -33,7 +33,7 @@ using System.Xml;
 namespace OpenSim.Region.Scenes
 {
-    partial class Avatar
+    partial class ScenePresence
    {
        public class AvatarAnimations
        {
@@ -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.Avatar.Animations.AnimsLLUUID)
+                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID)
                {
                    AnimsNames.Add(kp.Value, kp.Key);
                }
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Update.cs
index 8b27efe..3885c0d 100644
--- a/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Update.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
 namespace OpenSim.Region.Scenes
 {
-    partial class Avatar
+    partial class ScenePresence
    { 
        /// <summary>
        /// 
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Scenes
        /// 
        /// </summary>
        /// <param name="remoteAvatar"></param>
-        public void SendUpdateToOtherClient(Avatar remoteAvatar)
+        public void SendUpdateToOtherClient(ScenePresence remoteAvatar)
        {
          
        }
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Scenes
        /// </summary>
        public void SendInitialPosition()
        {
-            this.ControllingClient.SendAvatarData(m_regionInfo, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos);
+            this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos);
        }
        /// <summary>
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Scenes
        /// 
        /// </summary>
        /// <param name="avatarInfo"></param>
-        public void SendAppearanceToOtherAgent(Avatar avatarInfo)
+        public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
        {
            
        }
@@ -161,7 +161,7 @@ namespace OpenSim.Region.Scenes
            LLVector3 pos2 = this.Pos;
            LLVector3 vel = this.Velocity;
-            float timeStep = 0.3f;
+            float timeStep = 0.2f;
            pos2.X = pos2.X + (vel.X * timeStep);
            pos2.Y = pos2.Y + (vel.Y * timeStep);
            pos2.Z = pos2.Z + (vel.Z * timeStep);
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
index 1149896..3fbda39 100644
--- a/OpenSim/OpenSim.Region/Scenes/Avatar.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
@@ -39,7 +39,7 @@ using Axiom.MathLib;
 namespace OpenSim.Region.Scenes
 {
-    public partial class Avatar : Entity
+    public partial class ScenePresence : Entity
    {
        public static bool PhysicsEngineFlying = false;
        public static AvatarAnimations Animations;
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Scenes
        /// <param name="world"></param>
        /// <param name="clientThreads"></param>
        /// <param name="regionDat"></param>
-        public Avatar(IClientAPI theClient, Scene world, RegionInfo reginfo)
+        public ScenePresence(IClientAPI theClient, Scene world, RegionInfo reginfo)
        {
            m_world = world;
@@ -93,15 +93,15 @@ namespace OpenSim.Region.Scenes
            Wearables = AvatarWearable.DefaultWearables;
            
            this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-            
            //register for events
-            ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance);
+            ControllingClient.OnRequestWearables += this.SendOurAppearance;
            //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
-            ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement);
+            ControllingClient.OnCompleteMovementToRegion += this.CompleteMovement;
-            ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition);
+            ControllingClient.OnCompleteMovementToRegion += this.SendInitialPosition;
-            ControllingClient.OnAgentUpdate += new UpdateAgent(this.HandleAgentUpdate);
+            ControllingClient.OnAgentUpdate += this.HandleAgentUpdate;
-           // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
+            // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
-           // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
+            // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
            //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
            
        }
@@ -202,7 +202,7 @@ namespace OpenSim.Region.Scenes
        /// </summary>
        public void SendTerseUpdateToALLClients()
        {
-            List<Avatar> avatars = this.m_world.RequestAvatarList();
+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
            for (int i = 0; i < avatars.Count; i++)
            {
                this.SendTerseUpdateToClient(avatars[i].ControllingClient);
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/IScriptHandler.cs b/OpenSim/OpenSim.Region/Scenes/scripting/IScriptHandler.cs
index 581ad43..797998d 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/IScriptHandler.cs
+++ b/OpenSim/OpenSim.Region/Scenes/scripting/IScriptHandler.cs
@@ -32,7 +32,7 @@ using libsecondlife;
 using OpenSim.Physics.Manager;
 using OpenSim.Region;
 using OpenSim.Region.Scenes;
-using Avatar=OpenSim.Region.Scenes.Avatar;
+using Avatar=OpenSim.Region.Scenes.ScenePresence;
 using Primitive = OpenSim.Region.Scenes.Primitive;
 namespace OpenSim.Region.Scripting
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index ee6d741..1895fb9 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -483,13 +483,13 @@ namespace OpenSim
        /// <param name="avatarID"></param>
        /// <param name="avatarLocalID"></param>
        /// <param name="Pos"></param>
-        public void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos)
+        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos)
        {
            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
            //send a objectupdate packet with information about the clients avatar
            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
-            objupdate.RegionData.RegionHandle = regionInfo.RegionHandle;
+            objupdate.RegionData.RegionHandle = regionHandle;
            objupdate.RegionData.TimeDilation = 64096;
            objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
            objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket();
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index b089bdc..5d15ae3 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -71,7 +71,7 @@ namespace OpenSim
        private AgentAssetUpload UploadAssets;
        private LLUUID newAssetFolder = LLUUID.Zero;
-        private bool debug = false;
+        private bool debug = true;
        protected IWorld m_world;
        private Dictionary<uint, ClientView> m_clientThreads;
        private AssetCache m_assetCache;
@@ -124,7 +124,7 @@ namespace OpenSim
            }
            this.m_inventoryCache.ClientLeaving(this.AgentID, null);
-            m_world.RemoveAvatar(this.AgentId);
+            m_world.RemoveClient(this.AgentId);
            m_clientThreads.Remove(this.CircuitCode);
            m_networkServer.RemoveClientCircuit(this.CircuitCode);
@@ -211,7 +211,7 @@ namespace OpenSim
        protected virtual void InitNewClient()
        {
            OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
-            this.m_world.AddNewAvatar(this, this.AgentID, false);
+            this.m_world.AddNewClient(this, this.AgentID, false);
        }
        protected virtual void AuthUser()
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 23eca3a..520f826 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -38,6 +38,7 @@
                <include name="../../bin/OpenSim.Framework.Console.dll" />
                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
                <include name="../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Region.dll" />
                <include name="../../bin/OpenSim.Servers.dll" />
                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
                <include name="System.dll" />
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs
index 804d46a..7254560 100644
--- a/OpenSim/OpenSim/Application.cs
+++ b/OpenSim/OpenSim/Application.cs
@@ -109,7 +109,7 @@ namespace OpenSim
            sim.m_sandbox = sandBoxMode;
            sim.user_accounts = userAccounts;
            sim.gridLocalAsset = gridLocalAsset;
-            OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = allowFlying;
+            OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
            sim.StartUp();
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index d6fbb11..0ef6cbd 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -362,23 +362,23 @@ namespace OpenSim
                case "":
                    this.m_physicsEngine = "basicphysics";
                    configData.SetAttribute("PhysicsEngine", "basicphysics");
-                    OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = false;
+                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
                    break;
                case "basicphysics":
                    this.m_physicsEngine = "basicphysics";
                    configData.SetAttribute("PhysicsEngine", "basicphysics");
-                    OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = false;
+                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
                    break;
                case "RealPhysX":
                    this.m_physicsEngine = "RealPhysX";
-                    OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = true;
+                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
                    break;
                case "OpenDynamicsEngine":
                    this.m_physicsEngine = "OpenDynamicsEngine";
-                    OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = true;
+                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
                    break;
            }
@@ -457,7 +457,7 @@ namespace OpenSim
                    m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
                    break;
                case "users":
-                    OpenSim.Region.Scenes.Avatar TempAv;
+                    OpenSim.Region.Scenes.ScenePresence TempAv;
                    m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
                    /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
                     {