aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SimStatsReporter.cs8
3 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 66662a0..6ca2bb4 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -344,6 +344,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
344 344
345 public event StartLure OnStartLure; 345 public event StartLure OnStartLure;
346 public event TeleportLureRequest OnTeleportLureRequest; 346 public event TeleportLureRequest OnTeleportLureRequest;
347 public event NetworkStats OnNetworkStatsUpdate;
347 348
348 349
349#pragma warning restore 67 350#pragma warning restore 67
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 2b8ee74..5bc416f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2346,6 +2346,9 @@ namespace OpenSim.Region.Environment.Scenes
2346 client.OnSoundTrigger += soundModule.TriggerSound; 2346 client.OnSoundTrigger += soundModule.TriggerSound;
2347 2347
2348 client.OnObjectOwner += ObjectOwner; 2348 client.OnObjectOwner += ObjectOwner;
2349
2350 if (m_statsReporter != null)
2351 client.OnNetworkStatsUpdate += m_statsReporter.AddPacketsFromClientStats;
2349 2352
2350 // EventManager.TriggerOnNewClient(client); 2353 // EventManager.TriggerOnNewClient(client);
2351 } 2354 }
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
index 70287fc..c614f78 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
@@ -409,6 +409,14 @@ namespace OpenSim.Region.Environment.Scenes
409 return lastReportedSimFPS; 409 return lastReportedSimFPS;
410 } 410 }
411 411
412 public void AddPacketsFromClientStats(int inPackets, int outPackets, int unAckedBytes)
413 {
414 AddInPackets(inPackets);
415 AddOutPackets(outPackets);
416 AddunAckedBytes(unAckedBytes);
417
418 }
419
412 #endregion 420 #endregion
413 } 421 }
414} 422}