aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-01-12 04:12:38 +0000
committerTeravus Ovares2008-01-12 04:12:38 +0000
commitcbcba1f026f3fb7b4a0601f7955270aa7e7bf818 (patch)
treead59172ce904899508b6de40dd071347a561573d /OpenSim
parentLinking osTerrainGetHeight, osTerrainSetHeight, and osRegionRestart to LSL_Ba... (diff)
downloadopensim-SC_OLD-cbcba1f026f3fb7b4a0601f7955270aa7e7bf818.zip
opensim-SC_OLD-cbcba1f026f3fb7b4a0601f7955270aa7e7bf818.tar.gz
opensim-SC_OLD-cbcba1f026f3fb7b4a0601f7955270aa7e7bf818.tar.bz2
opensim-SC_OLD-cbcba1f026f3fb7b4a0601f7955270aa7e7bf818.tar.xz
* Unmoderated the ODE FPS in the sim stats. Decided to do that after Andrew Linden insisted that Havok was running at 45fps internally.
* Set the SimStats packet as unreliable (so we don't require an ack and do resends on it)
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SimStatsReporter.cs6
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5278202..575fe01 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -643,6 +643,7 @@ namespace OpenSim.Region.Environment.Scenes
643 { 643 {
644 if (!agent.IsChildAgent) 644 if (!agent.IsChildAgent)
645 { 645 {
646 pack.Header.Reliable = false;
646 agent.ControllingClient.OutPacket(pack, ThrottleOutPacketType.Task); 647 agent.ControllingClient.OutPacket(pack, ThrottleOutPacketType.Task);
647 } 648 }
648 } 649 }
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
index 5033965..420769c 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
@@ -105,14 +105,14 @@ namespace OpenSim.Region.Environment.Scenes
105 float simfps = (int) (m_fps*5); 105 float simfps = (int) (m_fps*5);
106 106
107 if (simfps > 45) 107 if (simfps > 45)
108 simfps = simfps - (simfps - 45); 108 simfps = simfps - (simfps - 45);
109 if (simfps < 0) 109 if (simfps < 0)
110 simfps = 0; 110 simfps = 0;
111 111
112 float physfps = (m_pfps/statsUpdatesEveryMS); 112 float physfps = (m_pfps/statsUpdatesEveryMS);
113 113
114 if (physfps > 50) 114 if (physfps > 500)
115 physfps = physfps - (physfps - 50); 115 physfps = physfps - (physfps - 500);
116 116
117 if (physfps < 0) 117 if (physfps < 0)
118 physfps = 0; 118 physfps = 0;