aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-12 04:27:20 +0000
committerTeravus Ovares2008-02-12 04:27:20 +0000
commit6e01769bcff35be9cace62a0342cf2d275608891 (patch)
tree124df7910fc0f1d31a13e297ced2dd73ce91a292 /OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
parentdefault to appending for log files per Mantis 530, and per (diff)
downloadopensim-SC-6e01769bcff35be9cace62a0342cf2d275608891.zip
opensim-SC-6e01769bcff35be9cace62a0342cf2d275608891.tar.gz
opensim-SC-6e01769bcff35be9cace62a0342cf2d275608891.tar.bz2
opensim-SC-6e01769bcff35be9cace62a0342cf2d275608891.tar.xz
* A bunch of updates to make things more smooth.
** Sending the actual TimeDilation to the client now instead of the 62455 constant. The client is *supposed* to use that value to sync with the simulator. (actually sending ushort.maxvalue * TimeDilation) ** Disabling prim that inter-penetrate instead of just not attaching a joint ** Reduced prim spin a 'little' bit, but not *enough* ** Tweaked the TimeDilation algorithm to be closer to 1.0 by default and various changes to the sim stats reporter ** Created a .SetValues method to PhysicsVector so we can simply call the setvalues function instead of .x, .y, .z sets. ** Experimented with a .GetBytes Method on PhysicsActor to be able to use the LLVector3.FromBytes() method. ** Upped the Inter-penetration depth to 0.25 instead of .08.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SimStatsReporter.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SimStatsReporter.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
index 3e1fec2..a0539f0 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
@@ -181,7 +181,7 @@ namespace OpenSim.Region.Environment.Scenes
181 // Then we divide the whole amount by the amount of seconds pass in between stats updates. 181 // Then we divide the whole amount by the amount of seconds pass in between stats updates.
182 182
183 sb[0].StatID = (uint) Stats.TimeDilation; 183 sb[0].StatID = (uint) Stats.TimeDilation;
184 sb[0].StatValue = ((((m_timeDilation + (0.10f * statsUpdateFactor)) /10) / statsUpdateFactor)); 184 sb[0].StatValue = m_timeDilation ; //((((m_timeDilation + (0.10f * statsUpdateFactor)) /10) / statsUpdateFactor));
185 185
186 sb[1].StatID = (uint) Stats.SimFPS; 186 sb[1].StatID = (uint) Stats.SimFPS;
187 sb[1].StatValue = simfps/statsUpdateFactor; 187 sb[1].StatValue = simfps/statsUpdateFactor;
@@ -280,13 +280,13 @@ namespace OpenSim.Region.Environment.Scenes
280 280
281 public void AddTimeDilation(float td) 281 public void AddTimeDilation(float td)
282 { 282 {
283 float tdsetting = td; 283 //float tdsetting = td;
284 if (tdsetting > 1.0f) 284 //if (tdsetting > 1.0f)
285 tdsetting = (tdsetting - (tdsetting - 0.91f)); 285 //tdsetting = (tdsetting - (tdsetting - 0.91f));
286 286
287 if (tdsetting < 0) 287 //if (tdsetting < 0)
288 tdsetting = 0.0f; 288 //tdsetting = 0.0f;
289 m_timeDilation += tdsetting; 289 m_timeDilation = td;
290 } 290 }
291 291
292 public void SetRootAgents(int rootAgents) 292 public void SetRootAgents(int rootAgents)