diff options
| author | Melanie | 2012-06-09 16:28:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-09 16:28:22 +0100 |
| commit | 8c91e761c8ab0f327ab710cf9b0581e42c20374b (patch) | |
| tree | b9e133efe376878064c12b83a4e6d5eef62ceb4e /OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Create avatar entries necessary to stop new v3 avatars being clouds (pants, s... (diff) | |
| download | opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.zip opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.gz opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.bz2 opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs b/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs index 90b3ede..1b8535c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs | |||
| @@ -39,7 +39,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 39 | public sealed class IncomingPacket | 39 | public sealed class IncomingPacket |
| 40 | { | 40 | { |
| 41 | /// <summary>Client this packet came from</summary> | 41 | /// <summary>Client this packet came from</summary> |
| 42 | public LLUDPClient Client; | 42 | public LLClientView Client; |
| 43 | |||
| 43 | /// <summary>Packet data that has been received</summary> | 44 | /// <summary>Packet data that has been received</summary> |
| 44 | public Packet Packet; | 45 | public Packet Packet; |
| 45 | 46 | ||
| @@ -48,7 +49,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 48 | /// </summary> | 49 | /// </summary> |
| 49 | /// <param name="client">Reference to the client this packet came from</param> | 50 | /// <param name="client">Reference to the client this packet came from</param> |
| 50 | /// <param name="packet">Packet data</param> | 51 | /// <param name="packet">Packet data</param> |
| 51 | public IncomingPacket(LLUDPClient client, Packet packet) | 52 | public IncomingPacket(LLClientView client, Packet packet) |
| 52 | { | 53 | { |
| 53 | Client = client; | 54 | Client = client; |
| 54 | Packet = packet; | 55 | Packet = packet; |