aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-05-31 13:45:18 +0000
committerMW2007-05-31 13:45:18 +0000
commitee5bd67b82f2fae77477b22765ba830e29ce4fd3 (patch)
tree865f82fc245ef061b636f7da6b3e9b15ee5fb4ca /OpenSim
parent(no commit message) (diff)
downloadopensim-SC_OLD-ee5bd67b82f2fae77477b22765ba830e29ce4fd3.zip
opensim-SC_OLD-ee5bd67b82f2fae77477b22765ba830e29ce4fd3.tar.gz
opensim-SC_OLD-ee5bd67b82f2fae77477b22765ba830e29ce4fd3.tar.bz2
opensim-SC_OLD-ee5bd67b82f2fae77477b22765ba830e29ce4fd3.tar.xz
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/PacketServer.cs6
-rw-r--r--OpenSim/OpenSim.RegionServer/UDPServer.cs2
3 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index d7e681f..d970162 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -78,10 +78,11 @@ namespace OpenSim
78 private int cachedtextureserial = 0; 78 private int cachedtextureserial = 0;
79 private RegionInfo m_regionData; 79 private RegionInfo m_regionData;
80 protected AuthenticateSessionsBase m_authenticateSessionsHandler; 80 protected AuthenticateSessionsBase m_authenticateSessionsHandler;
81 protected uint serverPort = 0;
81 82
82 83 public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions, uint port)
83 public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
84 { 84 {
85 this.serverPort = port;
85 m_world = world; 86 m_world = world;
86 m_clientThreads = clientThreads; 87 m_clientThreads = clientThreads;
87 m_assetCache = assetCache; 88 m_assetCache = assetCache;
diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs
index 0ab4a8d..ab77b5d 100644
--- a/OpenSim/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim/OpenSim.RegionServer/PacketServer.cs
@@ -16,10 +16,12 @@ namespace OpenSim
16 private IWorld _localWorld; 16 private IWorld _localWorld;
17 public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>(); 17 public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>();
18 public Dictionary<uint, IClientAPI> ClientAPIs = new Dictionary<uint, IClientAPI>(); 18 public Dictionary<uint, IClientAPI> ClientAPIs = new Dictionary<uint, IClientAPI>();
19 protected uint serverPort;
19 20
20 public PacketServer(OpenSimNetworkHandler networkHandler) 21 public PacketServer(OpenSimNetworkHandler networkHandler, uint port)
21 { 22 {
22 _networkHandler = networkHandler; 23 _networkHandler = networkHandler;
24 this.serverPort = port;
23 _networkHandler.RegisterPacketServer(this); 25 _networkHandler.RegisterPacketServer(this);
24 } 26 }
25 27
@@ -66,7 +68,7 @@ namespace OpenSim
66 68
67 public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass) 69 public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass)
68 { 70 {
69 ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, this._localWorld, assetCache, this, inventoryCache, authenticateSessionsClass); 71 ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, this._localWorld, assetCache, this, inventoryCache, authenticateSessionsClass, serverPort);
70 this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); 72 this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
71 this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser); 73 this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);
72 74
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index 5d8c1d8..fce5555 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -82,7 +82,7 @@ namespace OpenSim
82 82
83 protected virtual void CreatePacketServer() 83 protected virtual void CreatePacketServer()
84 { 84 {
85 PacketServer packetServer = new PacketServer(this); 85 PacketServer packetServer = new PacketServer(this, (uint) listenPort);
86 } 86 }
87 87
88 protected virtual void OnReceivedData(IAsyncResult result) 88 protected virtual void OnReceivedData(IAsyncResult result)