diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs index 56219d1..0f16fd4 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | |||
| @@ -48,11 +48,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 48 | /// <summary> | 48 | /// <summary> |
| 49 | /// Tweakable user settings | 49 | /// Tweakable user settings |
| 50 | /// </summary> | 50 | /// </summary> |
| 51 | private ClientStackUserSettings m_userSettings; | 51 | private ClientStackUserSettings m_userSettings; |
| 52 | 52 | ||
| 53 | public LLPacketServer(ILLClientStackNetworkHandler networkHandler, ClientStackUserSettings userSettings) | 53 | public LLPacketServer(ILLClientStackNetworkHandler networkHandler, ClientStackUserSettings userSettings) |
| 54 | { | 54 | { |
| 55 | m_userSettings = userSettings; | 55 | m_userSettings = userSettings; |
| 56 | m_networkHandler = networkHandler; | 56 | m_networkHandler = networkHandler; |
| 57 | 57 | ||
| 58 | m_networkHandler.RegisterPacketServer(this); | 58 | m_networkHandler.RegisterPacketServer(this); |
| @@ -129,7 +129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 129 | /// <param name="proxyEP"></param> | 129 | /// <param name="proxyEP"></param> |
| 130 | /// <returns> | 130 | /// <returns> |
| 131 | /// true if a new circuit was created, false if a circuit with the given circuit code already existed | 131 | /// true if a new circuit was created, false if a circuit with the given circuit code already existed |
| 132 | /// </returns> | 132 | /// </returns> |
| 133 | public virtual bool AddNewClient( | 133 | public virtual bool AddNewClient( |
| 134 | EndPoint epSender, UseCircuitCodePacket useCircuit, | 134 | EndPoint epSender, UseCircuitCodePacket useCircuit, |
| 135 | AuthenticateResponse sessionInfo, EndPoint proxyEP) | 135 | AuthenticateResponse sessionInfo, EndPoint proxyEP) |