aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/ClientManager.cs7
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs11
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
5 files changed, 16 insertions, 8 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 85dafef..091f308 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -88,7 +88,12 @@ namespace OpenSim.Framework
88 } 88 }
89 } 89 }
90 90
91 public void InPacket(uint circuitCode, Packet packet) 91 /// <summary>
92 /// Pass incoming packet to client.
93 /// </summary>
94 /// <param name="circuitCode">uint identifying the connection/client.</param>
95 /// <param name="packet">object containing the packet.</param>
96 public void InPacket(uint circuitCode, object packet)
92 { 97 {
93 IClientAPI client; 98 IClientAPI client;
94 bool tryGetRet = false; 99 bool tryGetRet = false;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index d7f0ed4..893a783 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -703,7 +703,7 @@ namespace OpenSim.Framework
703 703
704 704
705 void SetDebug(int newDebug); 705 void SetDebug(int newDebug);
706 void InPacket(Packet NewPack); 706 void InPacket(object NewPack);
707 void ProcessInPacket(Packet NewPack); 707 void ProcessInPacket(Packet NewPack);
708 void Close(bool ShutdownCircuit); 708 void Close(bool ShutdownCircuit);
709 void Kick(string message); 709 void Kick(string message);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index a1e270b..0acbd31 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3688,12 +3688,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3688 m_PacketHandler.PacketQueue.SetThrottleFromClient(throttles); 3688 m_PacketHandler.PacketQueue.SetThrottleFromClient(throttles);
3689 } 3689 }
3690 3690
3691 /// method gets called when a new packet has arrived from the UDP server. This happens after it's been decoded into a libsl object 3691 /// <summary>
3692 /// Method gets called when a new packet has arrived from the UDP
3693 /// server. This happens after it's been decoded into a libsl object.
3692 /// </summary> 3694 /// </summary>
3693 /// <param name="NewPack"></param> 3695 /// <param name="NewPack">object containing the packet.</param>
3694 public virtual void InPacket(Packet NewPack) 3696 public virtual void InPacket(object NewPack)
3695 { 3697 {
3696 m_PacketHandler.InPacket(NewPack); 3698 // Cast NewPack to Packet.
3699 m_PacketHandler.InPacket((Packet) NewPack);
3697 } 3700 }
3698 3701
3699 /// <summary> 3702 /// <summary>
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index e286d23..fff2383 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -716,7 +716,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
716 { 716 {
717 } 717 }
718 718
719 public void InPacket(Packet NewPack) 719 public void InPacket(object NewPack)
720 { 720 {
721 } 721 }
722 722
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 2196dcc..e6aff15 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -708,7 +708,7 @@ namespace OpenSim.Region.Examples.SimpleModule
708 { 708 {
709 } 709 }
710 710
711 public void InPacket(Packet NewPack) 711 public void InPacket(object NewPack)
712 { 712 {
713 } 713 }
714 714