diff options
author | Adam Frisby | 2007-09-24 16:39:26 +0000 |
---|---|---|
committer | Adam Frisby | 2007-09-24 16:39:26 +0000 |
commit | 4e01aa4879381a6b6230ea63b52c513656a2896f (patch) | |
tree | af82ae54f0792381e410142d876fc23aaa5eaf30 /OpenSim/Region/Environment/Scenes | |
parent | * Fixed an issue where it chose the smaller rather than larger of the two num... (diff) | |
download | opensim-SC-4e01aa4879381a6b6230ea63b52c513656a2896f.zip opensim-SC-4e01aa4879381a6b6230ea63b52c513656a2896f.tar.gz opensim-SC-4e01aa4879381a6b6230ea63b52c513656a2896f.tar.bz2 opensim-SC-4e01aa4879381a6b6230ea63b52c513656a2896f.tar.xz |
* Added time dilation property to Scene
* Default Terrain algorithm now produces something slightly less mountainous.
* Fixed lolcat
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index fbda669..5849519 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -100,6 +100,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
100 | protected float m_timespan = 0.1f; | 100 | protected float m_timespan = 0.1f; |
101 | protected DateTime m_lastupdate = DateTime.Now; | 101 | protected DateTime m_lastupdate = DateTime.Now; |
102 | 102 | ||
103 | protected float m_timedilation = 1.0f; | ||
104 | |||
103 | private int m_update_physics = 1; | 105 | private int m_update_physics = 1; |
104 | private int m_update_entitymovement = 1; | 106 | private int m_update_entitymovement = 1; |
105 | private int m_update_entities = 1; | 107 | private int m_update_entities = 1; |
@@ -307,6 +309,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
307 | finally | 309 | finally |
308 | { | 310 | { |
309 | updateLock.ReleaseMutex(); | 311 | updateLock.ReleaseMutex(); |
312 | |||
313 | m_timedilation = m_timespan / (float)SinceLastFrame.TotalSeconds; | ||
310 | m_lastupdate = DateTime.Now; | 314 | m_lastupdate = DateTime.Now; |
311 | } | 315 | } |
312 | } | 316 | } |