aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer
diff options
context:
space:
mode:
authorMW2007-06-18 14:41:38 +0000
committerMW2007-06-18 14:41:38 +0000
commit82d309d00765944654db023416a104d96de04328 (patch)
tree51b0f366479231b0061be1dad9df7823cf3e7457 /OpenSim/OpenSim.RegionServer
parentFixed inverted map texture problem. (diff)
downloadopensim-SC-82d309d00765944654db023416a104d96de04328.zip
opensim-SC-82d309d00765944654db023416a104d96de04328.tar.gz
opensim-SC-82d309d00765944654db023416a104d96de04328.tar.bz2
opensim-SC-82d309d00765944654db023416a104d96de04328.tar.xz
Fixed the flashing when crossing a border.
Diffstat (limited to 'OpenSim/OpenSim.RegionServer')
-rw-r--r--OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs2
-rw-r--r--OpenSim/OpenSim.RegionServer/UDPServer.cs6
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs b/OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs
index d0cbe2b..635bbdf 100644
--- a/OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs
@@ -32,6 +32,7 @@ using OpenSim.Framework.Interfaces;
32 32
33namespace OpenSim 33namespace OpenSim
34{ 34{
35
35 public class NetworkServersInfo 36 public class NetworkServersInfo
36 { 37 {
37 public string AssetURL = "http://127.0.0.1:8003/"; 38 public string AssetURL = "http://127.0.0.1:8003/";
@@ -115,4 +116,5 @@ namespace OpenSim
115 } 116 }
116 } 117 }
117 } 118 }
119
118} 120}
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index 315cb2c..54ec480 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -151,20 +151,20 @@ namespace OpenSim
151 151
152 public void ServerListener() 152 public void ServerListener()
153 { 153 {
154 m_console.WriteLine("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); 154 m_console.WriteLine(LogPriority.LOW, "UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
155 155
156 ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort); 156 ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
157 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); 157 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
158 Server.Bind(ServerIncoming); 158 Server.Bind(ServerIncoming);
159 159
160 m_console.WriteLine("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); 160 m_console.WriteLine(LogPriority.LOW, "UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
161 161
162 ipeSender = new IPEndPoint(IPAddress.Any, 0); 162 ipeSender = new IPEndPoint(IPAddress.Any, 0);
163 epSender = (EndPoint)ipeSender; 163 epSender = (EndPoint)ipeSender;
164 ReceivedData = new AsyncCallback(this.OnReceivedData); 164 ReceivedData = new AsyncCallback(this.OnReceivedData);
165 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); 165 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
166 166
167 m_console.WriteLine("UDPServer.cs:ServerListener() - Listening..."); 167 m_console.WriteLine(LogPriority.LOW, "UDPServer.cs:ServerListener() - Listening...");
168 168
169 } 169 }
170 170