aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJonathan Freedman2010-11-21 20:01:48 -0800
committerJonathan Freedman2010-11-21 20:01:48 -0800
commitb7f5e8284360f92e0e102b9546076573c57d9397 (patch)
tree132663da8c1882e524241b55a739ef2758ef8958 /OpenSim/Region/ClientStack
parentMerge https://github.com/opensim/opensim into mantis5110 (diff)
parentMerge branch 'master' of /var/git/opensim/ (diff)
downloadopensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.zip
opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.gz
opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.bz2
opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.xz
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs5
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs23
2 files changed, 23 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 8d85d1a..7851c4d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -6016,8 +6016,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6016 SoundTrigger handlerSoundTrigger = OnSoundTrigger; 6016 SoundTrigger handlerSoundTrigger = OnSoundTrigger;
6017 if (handlerSoundTrigger != null) 6017 if (handlerSoundTrigger != null)
6018 { 6018 {
6019 handlerSoundTrigger(soundTriggerPacket.SoundData.SoundID, soundTriggerPacket.SoundData.OwnerID, 6019 // UUIDS are sent as zeroes by the client, substitute agent's id
6020 soundTriggerPacket.SoundData.ObjectID, soundTriggerPacket.SoundData.ParentID, 6020 handlerSoundTrigger(soundTriggerPacket.SoundData.SoundID, AgentId,
6021 AgentId, AgentId,
6021 soundTriggerPacket.SoundData.Gain, soundTriggerPacket.SoundData.Position, 6022 soundTriggerPacket.SoundData.Gain, soundTriggerPacket.SoundData.Position,
6022 soundTriggerPacket.SoundData.Handle, 0); 6023 soundTriggerPacket.SoundData.Handle, 0);
6023 6024
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index ca5a7bd..c4db5da 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -246,11 +246,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
246 throw new NotImplementedException(); 246 throw new NotImplementedException();
247 } 247 }
248 248
249 /// <summary>
250 /// Return statistics information about client packet queues.
251 /// </summary>
252 ///
253 /// FIXME: This should really be done in a more sensible manner rather than sending back a formatted string.
254 ///
255 /// <returns></returns>
249 public string GetStats() 256 public string GetStats()
250 { 257 {
251 // TODO: ??? 258 return string.Format(
252 return string.Format("{0,7} {1,7} {2,7} {3,7} {4,7} {5,7} {6,7} {7,7} {8,7} {9,7}", 259 "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}",
253 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); 260 PacketsSent,
261 PacketsReceived,
262 UnackedBytes,
263 m_throttleCategories[(int)ThrottleOutPacketType.Resend].Content,
264 m_throttleCategories[(int)ThrottleOutPacketType.Land].Content,
265 m_throttleCategories[(int)ThrottleOutPacketType.Wind].Content,
266 m_throttleCategories[(int)ThrottleOutPacketType.Cloud].Content,
267 m_throttleCategories[(int)ThrottleOutPacketType.Task].Content,
268 m_throttleCategories[(int)ThrottleOutPacketType.Texture].Content,
269 m_throttleCategories[(int)ThrottleOutPacketType.Asset].Content,
270 m_throttleCategories[(int)ThrottleOutPacketType.State].Content);
254 } 271 }
255 272
256 public void SendPacketStats() 273 public void SendPacketStats()