9 files changed, 66 insertions, 61 deletions

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");

-                   // this.Terrain.hills();

+                    // Console.WriteLine("creating new terrain");

+                    // 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.OnRequestWearables += new GenericCall(this.InformClientOfNeighbours);

-            remoteClient.OnAddPrim += new GenericCall4(this.AddNewPrim);

-            remoteClient.OnUpdatePrimPosition += new UpdatePrimVector(this.UpdatePrimPosition);

-            remoteClient.OnRequestMapBlocks += new RequestMapBlocks(this.RequestMapBlocks);

-            remoteClient.OnTeleportLocationRequest += new TeleportLocationRequest(this.RequestTeleportLocation);

+            remoteClient.OnChatFromViewer += this.SimChat;

+            remoteClient.OnRequestWearables += this.InformClientOfNeighbours;

+            remoteClient.OnAddPrim += this.AddNewPrim;

+            remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition;

+            remoteClient.OnRequestMapBlocks += this.RequestMapBlocks;

+            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 += new GenericCall2(this.SendInitialPosition);

-            ControllingClient.OnAgentUpdate += new UpdateAgent(this.HandleAgentUpdate);

-           // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);

-           // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);

+            ControllingClient.OnCompleteMovementToRegion += this.CompleteMovement;

+            ControllingClient.OnCompleteMovementToRegion += this.SendInitialPosition;

+            ControllingClient.OnAgentUpdate += this.HandleAgentUpdate;

+            // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);

+            // 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