aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorMelanie2011-01-23 23:29:25 +0000
committerMelanie2011-01-23 23:29:25 +0000
commit105deab601244584d779e8b7d1e8275b8aeb15ec (patch)
tree63e2f064a748fddcaa566fde915ee56e8546220b /OpenSim/Region/ClientStack/LindenUDP
parentCompletely nixing flags from the client causes wearables to break. Fix it (diff)
parentFixes mantis #5343 (diff)
downloadopensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.zip
opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.gz
opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.bz2
opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs18
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs8
3 files changed, 15 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index eb5c0f5..72348b9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -370,6 +370,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
370 #region Properties 370 #region Properties
371 371
372 public LLUDPClient UDPClient { get { return m_udpClient; } } 372 public LLUDPClient UDPClient { get { return m_udpClient; } }
373 public LLUDPServer UDPServer { get { return m_udpServer; } }
373 public IPEndPoint RemoteEndPoint { get { return m_udpClient.RemoteEndPoint; } } 374 public IPEndPoint RemoteEndPoint { get { return m_udpClient.RemoteEndPoint; } }
374 public UUID SecureSessionId { get { return m_secureSessionId; } } 375 public UUID SecureSessionId { get { return m_secureSessionId; } }
375 public IScene Scene { get { return m_scene; } } 376 public IScene Scene { get { return m_scene; } }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index 5aa9b40..f1fdbc5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -257,18 +257,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
257 public string GetStats() 257 public string GetStats()
258 { 258 {
259 return string.Format( 259 return string.Format(
260 "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}", 260 "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}",
261 PacketsSent, 261 PacketsSent,
262 PacketsReceived, 262 PacketsReceived,
263 UnackedBytes, 263 UnackedBytes,
264 m_throttleCategories[(int)ThrottleOutPacketType.Resend].Content, 264 m_packetOutboxes[(int)ThrottleOutPacketType.Resend].Count,
265 m_throttleCategories[(int)ThrottleOutPacketType.Land].Content, 265 m_packetOutboxes[(int)ThrottleOutPacketType.Land].Count,
266 m_throttleCategories[(int)ThrottleOutPacketType.Wind].Content, 266 m_packetOutboxes[(int)ThrottleOutPacketType.Wind].Count,
267 m_throttleCategories[(int)ThrottleOutPacketType.Cloud].Content, 267 m_packetOutboxes[(int)ThrottleOutPacketType.Cloud].Count,
268 m_throttleCategories[(int)ThrottleOutPacketType.Task].Content, 268 m_packetOutboxes[(int)ThrottleOutPacketType.Task].Count,
269 m_throttleCategories[(int)ThrottleOutPacketType.Texture].Content, 269 m_packetOutboxes[(int)ThrottleOutPacketType.Texture].Count,
270 m_throttleCategories[(int)ThrottleOutPacketType.Asset].Content, 270 m_packetOutboxes[(int)ThrottleOutPacketType.Asset].Count,
271 m_throttleCategories[(int)ThrottleOutPacketType.State].Content); 271 m_packetOutboxes[(int)ThrottleOutPacketType.State].Count);
272 } 272 }
273 273
274 public void SendPacketStats() 274 public void SendPacketStats()
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index f969bc3..703176c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -114,8 +114,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
114 //private UDPClientCollection m_clients = new UDPClientCollection(); 114 //private UDPClientCollection m_clients = new UDPClientCollection();
115 /// <summary>Bandwidth throttle for this UDP server</summary> 115 /// <summary>Bandwidth throttle for this UDP server</summary>
116 protected TokenBucket m_throttle; 116 protected TokenBucket m_throttle;
117
117 /// <summary>Bandwidth throttle rates for this UDP server</summary> 118 /// <summary>Bandwidth throttle rates for this UDP server</summary>
118 protected ThrottleRates m_throttleRates; 119 public ThrottleRates ThrottleRates { get; private set; }
120
119 /// <summary>Manages authentication for agent circuits</summary> 121 /// <summary>Manages authentication for agent circuits</summary>
120 private AgentCircuitManager m_circuitManager; 122 private AgentCircuitManager m_circuitManager;
121 /// <summary>Reference to the scene this UDP server is attached to</summary> 123 /// <summary>Reference to the scene this UDP server is attached to</summary>
@@ -226,7 +228,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
226 #endregion BinaryStats 228 #endregion BinaryStats
227 229
228 m_throttle = new TokenBucket(null, sceneThrottleBps, sceneThrottleBps); 230 m_throttle = new TokenBucket(null, sceneThrottleBps, sceneThrottleBps);
229 m_throttleRates = new ThrottleRates(configSource); 231 ThrottleRates = new ThrottleRates(configSource);
230 } 232 }
231 233
232 public void Start() 234 public void Start()
@@ -922,7 +924,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
922 protected virtual void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo) 924 protected virtual void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo)
923 { 925 {
924 // Create the LLUDPClient 926 // Create the LLUDPClient
925 LLUDPClient udpClient = new LLUDPClient(this, m_throttleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); 927 LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO);
926 IClientAPI existingClient; 928 IClientAPI existingClient;
927 929
928 if (!m_scene.TryGetClient(agentID, out existingClient)) 930 if (!m_scene.TryGetClient(agentID, out existingClient))