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
         private int cachedtextureserial = 0;

         private RegionInfo m_regionData;

         protected AuthenticateSessionsBase m_authenticateSessionsHandler;

+        protected uint serverPort = 0;

 

-

-        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)

+        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions, uint port)

         {

+            this.serverPort = port;

             m_world = world;

             m_clientThreads = clientThreads;

             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
         private IWorld _localWorld;

         public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>();

         public Dictionary<uint, IClientAPI> ClientAPIs = new Dictionary<uint, IClientAPI>();

+        protected uint serverPort;

 

-        public PacketServer(OpenSimNetworkHandler networkHandler)

+        public PacketServer(OpenSimNetworkHandler networkHandler, uint port)

         {

             _networkHandler = networkHandler;

+            this.serverPort = port;

             _networkHandler.RegisterPacketServer(this);

         }

 

@@ -66,7 +68,7 @@ namespace OpenSim
 

         public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass)

         {

-            ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, this._localWorld, assetCache, this, inventoryCache, authenticateSessionsClass);

+            ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, this._localWorld, assetCache, this, inventoryCache, authenticateSessionsClass, serverPort);

             this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);

             this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);

 

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
 

         protected virtual void CreatePacketServer()

         {

-            PacketServer packetServer = new PacketServer(this);

+            PacketServer packetServer = new PacketServer(this, (uint) listenPort);

         }

 

         protected virtual void OnReceivedData(IAsyncResult result)