More refactoring.

3 files changed, 21 insertions, 0 deletions

diff --git a/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim.RegionServer/world/Avatar.Update.cs
index ee72ba3..266fc38 100644
--- a/OpenSim.RegionServer/world/Avatar.Update.cs
+++ b/OpenSim.RegionServer/world/Avatar.Update.cs
@@ -93,6 +93,11 @@ namespace OpenSim.world
             }

 

         }

+        public void SendUpdateToOtherClient(Avatar RemoteAvatar)

+        {

+            ObjectUpdatePacket objupdate = CreateUpdatePacket();

+            RemoteAvatar.SendPacketToViewer(objupdate);

+        }

 

         public ObjectUpdatePacket CreateUpdatePacket()

         {

diff --git a/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim.RegionServer/world/World.PacketHandlers.cs
index d12013a..119bb19 100644
--- a/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ b/OpenSim.RegionServer/world/World.PacketHandlers.cs
@@ -168,6 +168,20 @@ namespace OpenSim.world
             return true;

         }

 

+        public void SendAvatarsToClient(ClientView RemoteClient)

+        {

+            foreach (ClientView client in m_clientThreads.Values)

+            {

+                if (client.AgentID != RemoteClient.AgentID)

+                {

+                   // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();

+                   // RemoteClient.OutPacket(objupdate);

+                    client.ClientAvatar.SendUpdateToOtherClient(RemoteClient.ClientAvatar);

+                    client.ClientAvatar.SendAppearanceToOtherAgent(RemoteClient.ClientAvatar);

+                }

+            }

+        }

+

         /*

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

         {

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 70ca680..99fb8e0 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -538,6 +538,8 @@ namespace OpenSim.world
             agentClient.OnModifyTerrain += new ClientView.ModifyTerrain(this.ModifyTerrain);

             agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData);

             agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims);

+            agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient);

+

             try

             {

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