6 files changed, 66 insertions, 51 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3813367..74a8874 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -9919,6 +9919,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return info;
         }
 
+        public EndPoint GetClientEP()
+        {
+            return m_userEndPoint;
+        }
+
         public void SetClientInfo(ClientInfo info)
         {
             m_PacketHandler.SetClientInfo(info);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index c0fb1c7..4b1a6b7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -643,28 +643,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             ClientInfo info = new ClientInfo();
 
-            // nobody seems to even look at the following data. since
-            // it's a rather expensive operation (lock, serializing
-            // packets, copying it into dictionary, etc) i've
-            // commented out the expensive (but unwanted?) bits below
-            // (dr scofield, 2009-06-24)
+            info.pendingAcks = m_PendingAcksMap;
+            info.needAck = new Dictionary<uint, byte[]>();
 
-            // info.pendingAcks = m_PendingAcks;
-            // info.needAck = new Dictionary<uint, byte[]>();
-
-            // lock (m_NeedAck)
-            // {
-            //     foreach (uint key in m_NeedAck.Keys)
-            //         info.needAck.Add(key, m_NeedAck[key].Packet.ToBytes());
-            // }
+            lock (m_NeedAck)
+            {
+                foreach (uint key in m_NeedAck.Keys)
+                    info.needAck.Add(key, m_NeedAck[key].Packet.ToBytes());
+            }
 
-            // LLQueItem[] queitems = m_PacketQueue.GetQueueArray();
+            LLQueItem[] queitems = m_PacketQueue.GetQueueArray();
 
-            // for (int i = 0; i < queitems.Length; i++)
-            // {
-            //     if (queitems[i].Incoming == false)
-            //         info.out_packets.Add(queitems[i].Packet.ToBytes());
-            // }
+            for (int i = 0; i < queitems.Length; i++)
+            {
+                if (queitems[i].Incoming == false)
+                    info.out_packets.Add(queitems[i].Packet.ToBytes());
+            }
 
             info.sequence = m_Sequence;
 
@@ -683,37 +677,38 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SetClientInfo(ClientInfo info)
         {
-            // m_PendingAcks = info.pendingAcks;
-            // m_NeedAck = new Dictionary<uint, LLQueItem>();
-
-            // Packet packet = null;
-            // int packetEnd = 0;
-            // byte[] zero = new byte[3000];
-
-            // foreach (uint key in info.needAck.Keys)
-            // {
-            //     byte[] buff = info.needAck[key];
-            //     packetEnd = buff.Length - 1;
-
-            //     try
-            //     {
-            //         packet = PacketPool.Instance.GetPacket(buff, ref packetEnd, zero);
-            //     }
-            //     catch (Exception)
-            //     {
-            //     }
-
-            //     LLQueItem item = new LLQueItem();
-            //     item.Packet = packet;
-            //     item.Incoming = false;
-            //     item.throttleType = 0;
-            //     item.TickCount = Environment.TickCount;
-            //     item.Identifier = 0;
-            //     item.Resends = 0;
-            //     item.Length = packet.Length;
-            //     item.Sequence = packet.Header.Sequence;
-            //     m_NeedAck.Add(key, item);
-            // }
+            m_PendingAcksMap = info.pendingAcks;
+            m_PendingAcks = new List<uint>(m_PendingAcksMap.Keys);
+            m_NeedAck = new Dictionary<uint, LLQueItem>();
+
+            Packet packet = null;
+            int packetEnd = 0;
+            byte[] zero = new byte[3000];
+
+            foreach (uint key in info.needAck.Keys)
+            {
+                byte[] buff = info.needAck[key];
+                packetEnd = buff.Length - 1;
+
+                try
+                {
+                    packet = PacketPool.Instance.GetPacket(buff, ref packetEnd, zero);
+                }
+                catch (Exception)
+                {
+                }
+
+                LLQueItem item = new LLQueItem();
+                item.Packet = packet;
+                item.Incoming = false;
+                item.throttleType = 0;
+                item.TickCount = Environment.TickCount;
+                item.Identifier = 0;
+                item.Resends = 0;
+                item.Length = packet.Length;
+                item.Sequence = packet.Header.Sequence;
+                m_NeedAck.Add(key, item);
+            }
 
             m_Sequence = info.sequence;
 
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index f797dbc..5e33729 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -843,6 +843,11 @@ namespace OpenSim.Region.Examples.SimpleModule
         {
         }
 
+        public EndPoint GetClientEP()
+        {
+            return null;
+        }
+
         public ClientInfo GetClientInfo()
         {
             return null;
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 9002a21..8ec1780 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1396,6 +1396,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             Disconnect();
         }
 
+        public EndPoint GetClientEP()
+        {
+            return null;
+        }
+
         public ClientInfo GetClientInfo()
         {
             return new ClientInfo();
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 0505fe8..228683e 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -855,6 +855,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
+        public EndPoint GetClientEP()
+        {
+            return null;
+        }
+
         public ClientInfo GetClientInfo()
         {
             return null;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 73c3e4c..7c878b8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -666,7 +666,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence)
             {
                 ScenePresence target = (ScenePresence)World.Entities[avatarID];
-                EndPoint ep = target.ControllingClient.GetClientInfo().userEP;
+                EndPoint ep = target.ControllingClient.GetClientEP();
                 if (ep is IPEndPoint)
                 {
                     IPEndPoint ip = (IPEndPoint)ep;