Start of a redesign of SimClient (now renamed ClientView)/World/Avatar/Prim , switching to a event based system (World/Avatar register as event handlers). It is possible that I've broke something with this commit but it doesn't matter as I'll just hide and no one will find me.

8 files changed, 101 insertions, 111 deletions

diff --git a/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim.RegionServer/world/Avatar.Update.cs
index ba2965d..75f0bb4 100644
--- a/OpenSim.RegionServer/world/Avatar.Update.cs
+++ b/OpenSim.RegionServer/world/Avatar.Update.cs
@@ -28,9 +28,10 @@ namespace OpenSim.world
                 terse.RegionData.TimeDilation = 64096;

                 terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];

                 terse.ObjectData[0] = terseBlock;

-                foreach (SimClient client in m_clientThreads.Values)

+                List<Avatar> avList = this.m_world.RequestAvatarList();

+                foreach (Avatar client in avList)

                 {

-                    client.OutPacket(terse);

+                    client.SendPacketToViewer(terse);

                 }

 

                 updateflag = false;

@@ -51,9 +52,10 @@ namespace OpenSim.world
                         terse.RegionData.TimeDilation = 64096;

                         terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];

                         terse.ObjectData[0] = terseBlock;

-                        foreach (SimClient client in m_clientThreads.Values)

+                        List<Avatar> avList = this.m_world.RequestAvatarList();

+                        foreach (Avatar client in avList)

                         {

-                            client.OutPacket(terse);

+                            client.SendPacketToViewer(terse);

                         }

                         _updateCount = 0;

                     }

@@ -134,15 +136,13 @@ namespace OpenSim.world
             byte[] pb = pos2.GetBytes();

             Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);

             m_world._localNumber++;

-            foreach (SimClient client in m_clientThreads.Values)

+

+            List<Avatar> avList = this.m_world.RequestAvatarList();

+            foreach (Avatar client in avList)

             {

-                client.OutPacket(objupdate);

-                if (client.AgentID != ControllingClient.AgentID)

+                client.SendPacketToViewer(objupdate);

+                if (client.ControllingClient.AgentID != this.ControllingClient.AgentID)

                 {

-                    //the below line is already in Simclient.cs at line number 245 , directly below the call to this method

-                    //if there is a problem/bug with that , then lets fix it there rather than duplicating it here

-                    //client.ClientAvatar.SendAppearanceToOtherAgent(this.ControllingClient);

-

                     SendAppearanceToOtherAgent(client);

                 }

             }

@@ -169,30 +169,12 @@ namespace OpenSim.world
             ControllingClient.OutPacket(aw);

         }

 

-        public void SendAppearanceToOtherAgent(SimClient userInfo)

+        public void SendAppearanceToOtherAgent(Avatar avatarInfo)

         {

             AvatarAppearancePacket avp = new AvatarAppearancePacket();

             avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];

             avp.ObjectData.TextureEntry = this.avatarAppearanceTexture.ToBytes();

 

-            //a wearable update packets should only be sent about the viewers/agents own avatar not for other avatars

-            //but it seems that the following code only created the packets and never actually sent them anyway

-            /*AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();

-            aw.AgentData.AgentID = this.ControllingClient.AgentID;

-            aw.AgentData.SessionID = userInfo.SessionID;

-            aw.AgentData.SerialNum = 0; //removed the use of a random number as a random number could be less than the last number, should have a counter variable for this

-

-            aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];

-            AgentWearablesUpdatePacket.WearableDataBlock awb;

-            for (int i = 0; i < 13; i++)

-            {

-                awb = new AgentWearablesUpdatePacket.WearableDataBlock();

-                awb.WearableType = (byte)i;

-                awb.AssetID = this.Wearables[i].AssetID;

-                awb.ItemID = this.Wearables[i].ItemID;

-                aw.WearableData[i] = awb;

-            }*/

-

             AvatarAppearancePacket.VisualParamBlock avblock = null;

             for (int i = 0; i < 218; i++)

             {

@@ -203,7 +185,7 @@ namespace OpenSim.world
 

             avp.Sender.IsTrial = false;

             avp.Sender.ID = ControllingClient.AgentID;

-            userInfo.OutPacket(avp);

+            avatarInfo.SendPacketToViewer(avp);

         }

 

         public void SetAppearance(AgentSetAppearancePacket appear)

@@ -214,9 +196,11 @@ namespace OpenSim.world
             {

                 this.visualParams[i] = appear.VisualParam[i].ParamValue;

             }

-            foreach (SimClient client in m_clientThreads.Values)

+

+            List<Avatar> avList = this.m_world.RequestAvatarList();

+            foreach (Avatar client in avList)

             {

-                if (client.AgentID != ControllingClient.AgentID)

+                if (client.ControllingClient.AgentID != this.ControllingClient.AgentID)

                 {

                     SendAppearanceToOtherAgent(client);

                 }

@@ -320,11 +304,12 @@ namespace OpenSim.world
             ani.AnimationList[0].AnimID = this.current_anim;

             ani.AnimationList[0].AnimSequenceID = this.anim_seq;

 

-            //ControllingClient.OutPacket(ani);

-            foreach (SimClient client in m_clientThreads.Values)

+            List<Avatar> avList = this.m_world.RequestAvatarList();

+            foreach (Avatar client in avList)

             {

-                client.OutPacket(ani);

+                client.SendPacketToViewer(ani);

             }

+          

         }

 

     }

diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
index c684c45..55e5ae4 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim.RegionServer/world/Avatar.cs
@@ -16,7 +16,7 @@ namespace OpenSim.world
         public static AvatarAnimations Animations;

         public string firstname;

         public string lastname;

-        public SimClient ControllingClient;

+        public ClientView ControllingClient;

         public LLUUID current_anim;

         public int anim_seq;

         private static libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate;

@@ -30,16 +30,16 @@ namespace OpenSim.world
         private AvatarWearable[] Wearables;

         private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);

         private ulong m_regionHandle;

-        private Dictionary<uint, SimClient> m_clientThreads;

+        //private Dictionary<uint, ClientView> m_clientThreads;

         private string m_regionName;

         private ushort m_regionWaterHeight;

         private bool m_regionTerraform;

         //private bool childShadowAvatar = false;

 

-        public Avatar(SimClient TheClient, World world, string regionName, Dictionary<uint, SimClient> clientThreads, ulong regionHandle, bool regionTerraform, ushort regionWater)

+        public Avatar(ClientView TheClient, World world, string regionName, Dictionary<uint, ClientView> clientThreads, ulong regionHandle, bool regionTerraform, ushort regionWater)

         {

             m_world = world;

-            m_clientThreads = clientThreads;

+           // m_clientThreads = clientThreads;

             m_regionName = regionName;

             m_regionHandle = regionHandle;

             m_regionTerraform = regionTerraform;

diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs
index 4f861f7..e048a9e 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim.RegionServer/world/Primitive.cs
@@ -22,7 +22,7 @@ namespace OpenSim.world
         private bool physicsEnabled = false;

         private bool physicstest = false;  

         private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);

-        private Dictionary<uint, SimClient> m_clientThreads;

+        private Dictionary<uint, ClientView> m_clientThreads;

         private ulong m_regionHandle;

         private const uint FULL_MASK_PERMISSIONS = 2147483647;

 

@@ -75,7 +75,7 @@ namespace OpenSim.world
             }

         }

 

-        public Primitive(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, World world)

+        public Primitive(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world)

         {

             mesh_cutbegin = 0.0f;

             mesh_cutend = 1.0f;

@@ -104,7 +104,7 @@ namespace OpenSim.world
             return this.primData.ToBytes();

         }

 

-        public void GetProperites(SimClient client)

+        public void GetProperites(ClientView client)

         {

             ObjectPropertiesPacket proper = new ObjectPropertiesPacket();

             proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];

@@ -164,7 +164,7 @@ namespace OpenSim.world
             }

             if (this.newPrimFlag)

             {   

-                foreach (SimClient client in m_clientThreads.Values)

+                foreach (ClientView client in m_clientThreads.Values)

                 {

                     client.OutPacket(OurPacket);

                 }

@@ -177,7 +177,7 @@ namespace OpenSim.world
                 terse.RegionData.TimeDilation = 64096;

                 terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];

                 terse.ObjectData[0] = this.CreateImprovedBlock();

-                foreach (SimClient client in m_clientThreads.Values)

+                foreach (ClientView client in m_clientThreads.Values)

                 {

                     client.OutPacket(terse);

                 }

@@ -185,7 +185,7 @@ namespace OpenSim.world
             }

             else if (this.dirtyFlag)

             {

-                foreach (SimClient client in m_clientThreads.Values)

+                foreach (ClientView client in m_clientThreads.Values)

                 {

                     UpdateClient(client);

                 }

@@ -202,7 +202,7 @@ namespace OpenSim.world
                         terse.RegionData.TimeDilation = 64096;

                         terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];

                         terse.ObjectData[0] = this.CreateImprovedBlock();

-                        foreach (SimClient client in m_clientThreads.Values)

+                        foreach (ClientView client in m_clientThreads.Values)

                         {

                             client.OutPacket(terse);

                         }

@@ -220,7 +220,7 @@ namespace OpenSim.world
             }

         }

 

-        public void UpdateClient(SimClient RemoteClient)

+        public void UpdateClient(ClientView RemoteClient)

         {

 

             LLVector3 lPos;

diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 3b39456..6d071d4 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -16,7 +16,7 @@ namespace OpenSim.world
         protected PrimData primData;

         //private ObjectUpdatePacket OurPacket;

         private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);

-        private Dictionary<uint, SimClient> m_clientThreads;

+        private Dictionary<uint, ClientView> m_clientThreads;

         private ulong m_regionHandle;

         private const uint FULL_MASK_PERMISSIONS = 2147483647;

         private bool physicsEnabled = false;

@@ -58,7 +58,7 @@ namespace OpenSim.world
         }

         #endregion

 

-        public Primitive2(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, World world)

+        public Primitive2(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world)

         {

             m_clientThreads = clientThreads;

             m_regionHandle = regionHandle;

@@ -66,6 +66,17 @@ namespace OpenSim.world
             inventoryItems = new Dictionary<LLUUID, InventoryItem>();

         }

 

+        public Primitive2(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world, LLUUID owner)

+        {

+            m_clientThreads = clientThreads;

+            m_regionHandle = regionHandle;

+            m_world = world;

+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();

+            this.primData = new PrimData();

+            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;

+            this.primData.OwnerID = owner;

+        }

+

         public byte[] GetByteArray()

         {

             byte[] result = null;

@@ -159,7 +170,7 @@ namespace OpenSim.world
 

         }

 

-        public void GetProperites(SimClient client)

+        public void GetProperites(ClientView client)

         {

             ObjectPropertiesPacket proper = new ObjectPropertiesPacket();

             proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];

@@ -202,12 +213,12 @@ namespace OpenSim.world
             return null;

         }

 

-        public void RequestInventoryInfo(SimClient simClient, RequestTaskInventoryPacket packet)

+        public void RequestInventoryInfo(ClientView simClient, RequestTaskInventoryPacket packet)

         {

 

         }

 

-        public void RequestXferInventory(SimClient simClient, ulong xferID)

+        public void RequestXferInventory(ClientView simClient, ulong xferID)

         {

             //will only currently work if the total size of the inventory data array is under about 1000 bytes

             SendXferPacketPacket send = new SendXferPacketPacket();

@@ -246,7 +257,7 @@ namespace OpenSim.world
         #region Update viewers Methods

 

         //should change these mehtods, so that outgoing packets are sent through the avatar class

-        public void SendFullUpdateToClient(SimClient remoteClient)

+        public void SendFullUpdateToClient(ClientView remoteClient)

         {

             LLVector3 lPos;

             if (this._physActor != null && this.physicsEnabled)

@@ -273,7 +284,7 @@ namespace OpenSim.world
 

         }

 

-        public void SendTerseUpdateToClient(SimClient RemoteClient)

+        public void SendTerseUpdateToClient(ClientView RemoteClient)

         {

 

         }

@@ -316,7 +327,7 @@ namespace OpenSim.world
             PData.PathTwist = addPacket.ObjectData.PathTwist;

             PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;

             LLVector3 pos1 = addPacket.ObjectData.RayEnd;

-            this.primData.FullID = this.uuid  = LLUUID.Random();

+            this.primData.FullID = this.uuid = LLUUID.Random();

             this.localid = (uint)(localID);

             this.primData.Position = this.Pos = pos1;

         }

diff --git a/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim.RegionServer/world/SceneObject.cs
index 5b5a7b2..a846fb5 100644
--- a/OpenSim.RegionServer/world/SceneObject.cs
+++ b/OpenSim.RegionServer/world/SceneObject.cs
@@ -15,7 +15,7 @@ namespace OpenSim.world
     {

         private LLUUID rootUUID;

         private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>();

-        private Dictionary<uint, SimClient> m_clientThreads;

+        private Dictionary<uint, ClientView> m_clientThreads;

         private World m_world;

 

         public SceneObject()

@@ -42,7 +42,7 @@ namespace OpenSim.world
 

         }

 

-        public void GetProperites(SimClient client)

+        public void GetProperites(ClientView client)

         {

             /*

             ObjectPropertiesPacket proper = new ObjectPropertiesPacket();

diff --git a/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim.RegionServer/world/World.PacketHandlers.cs
index 175b777..27f200f 100644
--- a/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ b/OpenSim.RegionServer/world/World.PacketHandlers.cs
@@ -16,7 +16,7 @@ namespace OpenSim.world
     public partial class World

     {

 

-        public bool ModifyTerrain(SimClient simClient, Packet packet)

+        public bool ModifyTerrain(ClientView simClient, Packet packet)

         {

             ModifyLandPacket modify = (ModifyLandPacket)packet;

 

@@ -42,68 +42,44 @@ namespace OpenSim.world
             return true;

         }

 

-        public bool SimChat(SimClient simClient, Packet packet)

-        {

-            System.Text.Encoding enc = System.Text.Encoding.ASCII;

-            ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)packet;

-            if (Util.FieldToString(inchatpack.ChatData.Message) == "")

-            {

-                //empty message so don't bother with it

-                return true;

-            }

-

-            string fromName = simClient.ClientAvatar.firstname + " " + simClient.ClientAvatar.lastname;

-            byte[] message = inchatpack.ChatData.Message;

-            byte type = inchatpack.ChatData.Type;

-            LLVector3 fromPos = simClient.ClientAvatar.Pos;

-            LLUUID fromAgentID = simClient.AgentID;

-

-            libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();

-            reply.ChatData.Audible = 1;

-            reply.ChatData.Message = message;

-            reply.ChatData.ChatType = type;

-            reply.ChatData.SourceType = 1;

-            reply.ChatData.Position = fromPos;

-            reply.ChatData.FromName = enc.GetBytes(fromName + "\0");

-            reply.ChatData.OwnerID = fromAgentID;

-            reply.ChatData.SourceID = fromAgentID;

-

-            foreach (SimClient client in m_clientThreads.Values)

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

+        {  

+            foreach (ClientView client in m_clientThreads.Values)

             {

                 // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));

-                int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(simClient.ClientAvatar.Pos);

+                int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(fromPos);

                 

-                switch (inchatpack.ChatData.Type)

+                switch (type)

                 {

                     case 0: // Whisper

                         if ((dis < 10) && (dis > -10))

                         {

-                            client.OutPacket(reply);

+                            //should change so the message is sent through the avatar rather than direct to the ClientView

+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);

                         }

                         break;

                     case 1: // Say

                         if ((dis < 30) && (dis > -30))

                         {

-                            client.OutPacket(reply);

+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);

                         }

                         break;

                     case 2: // Shout

                         if ((dis < 100) && (dis > -100))

                         {

-                            client.OutPacket(reply);

+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);

                         }

                         break;

                         

                     case 0xff: // Broadcast

-                        client.OutPacket(reply);

+                        client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);

                         break;

                 }

 

             }

-            return true;

         }

 

-        public bool RezObject(SimClient simClient, Packet packet)

+        public bool RezObject(ClientView simClient, Packet packet)

         {

             RezObjectPacket rezPacket = (RezObjectPacket)packet;

             AgentInventory inven = this._inventoryCache.GetAgentsInventory(simClient.AgentID);

@@ -126,7 +102,7 @@ namespace OpenSim.world
             return true;

         }

 

-        public bool DeRezObject(SimClient simClient, Packet packet)

+        public bool DeRezObject(ClientView simClient, Packet packet)

         {

             DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;

 

@@ -151,7 +127,7 @@ namespace OpenSim.world
                             kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];

                             kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();

                             kill.ObjectData[0].ID = ent.localid;

-                            foreach (SimClient client in m_clientThreads.Values)

+                            foreach (ClientView client in m_clientThreads.Values)

                             {

                                 client.OutPacket(kill);

                             }

@@ -201,7 +177,7 @@ namespace OpenSim.world
                         kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];

                         kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();

                         kill.ObjectData[0].ID = selectedEnt.localid;

-                        foreach (SimClient client in m_clientThreads.Values)

+                        foreach (ClientView client in m_clientThreads.Values)

                         {

                             client.OutPacket(kill);

                         }

@@ -215,7 +191,7 @@ namespace OpenSim.world
             return true;

         }

 

-        public void RequestMapBlock(SimClient simClient, int minX, int minY, int maxX, int maxY)

+        public void RequestMapBlock(ClientView simClient, int minX, int minY, int maxX, int maxY)

         {

             System.Text.Encoding _enc = System.Text.Encoding.ASCII;

             if (((m_regInfo.RegionLocX > minX) && (m_regInfo.RegionLocX < maxX)) && ((m_regInfo.RegionLocY > minY) && (m_regInfo.RegionLocY < maxY)))

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 983e66d..c90e3f6 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -57,7 +57,7 @@ namespace OpenSim.world
         /// <param name="clientThreads">Dictionary to contain client threads</param>

         /// <param name="regionHandle">Region Handle for this region</param>

         /// <param name="regionName">Region Name for this region</param>

-        public World(Dictionary<uint, SimClient> clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName)

+        public World(Dictionary<uint, ClientView> clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName)

         {

             try

             {

@@ -324,7 +324,7 @@ namespace OpenSim.world
                 }

                 this.localStorage.SaveMap(this.Terrain.getHeights1D());

 

-                foreach (SimClient client in m_clientThreads.Values)

+                foreach (ClientView client in m_clientThreads.Values)

                 {

                     this.SendLayerData(client);

                 }

@@ -355,7 +355,7 @@ namespace OpenSim.world
                 }

                 this.localStorage.SaveMap(this.Terrain.getHeights1D());

 

-                foreach (SimClient client in m_clientThreads.Values)

+                foreach (ClientView client in m_clientThreads.Values)

                 {

                     this.SendLayerData(client);

                 }

@@ -389,7 +389,7 @@ namespace OpenSim.world
                     }

                     this.localStorage.SaveMap(this.Terrain.getHeights1D());

 

-                    foreach (SimClient client in m_clientThreads.Values)

+                    foreach (ClientView client in m_clientThreads.Values)

                     {

                         this.SendLayerData(pointx, pointy, client);

                     }

@@ -437,7 +437,7 @@ namespace OpenSim.world
         /// Sends prims to a client

         /// </summary>

         /// <param name="RemoteClient">Client to send to</param>

-        public void GetInitialPrims(SimClient RemoteClient)

+        public void GetInitialPrims(ClientView RemoteClient)

         {

             try

             {

@@ -495,7 +495,7 @@ namespace OpenSim.world
             }

         }

 

-        public void AddNewPrim(ObjectAddPacket addPacket, SimClient AgentClient)

+        public void AddNewPrim(ObjectAddPacket addPacket, ClientView AgentClient)

         {

             AddNewPrim(addPacket, AgentClient.AgentID);

         }

@@ -530,8 +530,9 @@ namespace OpenSim.world
 

         #region Add/Remove Avatar Methods

 

-        public override void AddViewerAgent(SimClient agentClient)

+        public override void AddViewerAgent(ClientView agentClient)

         {

+            agentClient.OnChatFromViewer += new ClientView.ChatFromViewer(this.SimChat);

             try

             {

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");

@@ -576,7 +577,7 @@ namespace OpenSim.world
             }

         }

 

-        public override void RemoveViewerAgent(SimClient agentClient)

+        public override void RemoveViewerAgent(ClientView agentClient)

         {

             try

             {

@@ -600,6 +601,23 @@ namespace OpenSim.world
         }

         #endregion

 

+        #region Request Avatars List Methods

+        //The idea is to have a group of method that return a list of avatars meeting some requirement

+        // ie it could be all Avatars within a certain range of the calling prim/avatar. 

+

+        public List<Avatar> RequestAvatarList()

+        {

+            List<Avatar> result = new List<Avatar>();

+

+            foreach (Avatar avatar in Avatars.Values)

+            {

+                result.Add(avatar);

+            }

+

+            return result;

+        }

+        #endregion

+

         #region ShutDown

         /// <summary>

         /// Tidy before shutdown

diff --git a/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim.RegionServer/world/WorldBase.cs
index b8c086d..edc5518 100644
--- a/OpenSim.RegionServer/world/WorldBase.cs
+++ b/OpenSim.RegionServer/world/WorldBase.cs
@@ -20,7 +20,7 @@ namespace OpenSim.world
     public class WorldBase

     {

         public Dictionary<libsecondlife.LLUUID, Entity> Entities;

-        protected Dictionary<uint, SimClient> m_clientThreads;

+        protected Dictionary<uint, ClientView> m_clientThreads;

         protected ulong m_regionHandle;

         protected string m_regionName;

         protected InventoryCache _inventoryCache;

@@ -90,7 +90,7 @@ namespace OpenSim.world
         /// Send the region heightmap to the client

         /// </summary>

         /// <param name="RemoteClient">Client to send to</param>

-        public virtual void SendLayerData(SimClient RemoteClient)

+        public virtual void SendLayerData(ClientView RemoteClient)

         {

             try

             {

@@ -122,7 +122,7 @@ namespace OpenSim.world
         /// <param name="px">Patch coordinate (x) 0..16</param>

         /// <param name="py">Patch coordinate (y) 0..16</param>

         /// <param name="RemoteClient">The client to send to</param>

-        public void SendLayerData(int px, int py, SimClient RemoteClient)

+        public void SendLayerData(int px, int py, ClientView RemoteClient)

         {

             try

             {

@@ -148,7 +148,7 @@ namespace OpenSim.world
         /// Add a new Agent's avatar

         /// </summary>

         /// <param name="agentClient"></param>

-        public virtual void AddViewerAgent(SimClient agentClient)

+        public virtual void AddViewerAgent(ClientView agentClient)

         {

 

         }

@@ -157,7 +157,7 @@ namespace OpenSim.world
         /// Remove a Agent's avatar

         /// </summary>

         /// <param name="agentClient"></param>

-        public virtual void RemoveViewerAgent(SimClient agentClient)

+        public virtual void RemoveViewerAgent(ClientView agentClient)

         {

 

         }