aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs4
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs8
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 5b43fec..53ed2ab 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack
49 protected NetworkServersInfo m_networkServersInfo; 49 protected NetworkServersInfo m_networkServersInfo;
50 50
51 protected BaseHttpServer m_httpServer; 51 protected BaseHttpServer m_httpServer;
52 protected int m_httpServerPort; 52 protected uint m_httpServerPort;
53 53
54 protected LogBase m_log; 54 protected LogBase m_log;
55 protected CommunicationsManager m_commsManager; 55 protected CommunicationsManager m_commsManager;
@@ -106,7 +106,7 @@ namespace OpenSim.Region.ClientStack
106 protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer, bool m_permissions) 106 protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer, bool m_permissions)
107 { 107 {
108 AgentCircuitManager circuitManager = new AgentCircuitManager(); 108 AgentCircuitManager circuitManager = new AgentCircuitManager();
109 udpServer = new UDPServer(regionInfo.InternalEndPoint.Port, m_assetCache, m_log, circuitManager); 109 udpServer = new UDPServer((uint) regionInfo.InternalEndPoint.Port, m_assetCache, m_log, circuitManager);
110 110
111 Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager); 111 Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager);
112 112
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index b0586a3..aaf7224 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack
49 protected PacketServer m_packetServer; 49 protected PacketServer m_packetServer;
50 protected ulong m_regionHandle; 50 protected ulong m_regionHandle;
51 51
52 protected int listenPort; 52 protected uint listenPort;
53 protected IScene m_localScene; 53 protected IScene m_localScene;
54 protected AssetCache m_assetCache; 54 protected AssetCache m_assetCache;
55 protected LogBase m_log; 55 protected LogBase m_log;
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ClientStack
83 { 83 {
84 } 84 }
85 85
86 public UDPServer(int port, AssetCache assetCache, LogBase console, AgentCircuitManager authenticateClass) 86 public UDPServer(uint port, AssetCache assetCache, LogBase console, AgentCircuitManager authenticateClass)
87 { 87 {
88 listenPort = port; 88 listenPort = port;
89 m_assetCache = assetCache; 89 m_assetCache = assetCache;
@@ -180,9 +180,9 @@ namespace OpenSim.Region.ClientStack
180 180
181 public void ServerListener() 181 public void ServerListener()
182 { 182 {
183 m_log.Verbose("SERVER", "Opening UDP socket on " + listenPort); 183 m_log.Verbose("SERVER", "Opening UDP socket on " + listenPort.ToString());
184 184
185 ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); 185 ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) listenPort);
186 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); 186 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
187 Server.Bind(ServerIncoming); 187 Server.Bind(ServerIncoming);
188 188