diff options
| author | John Hurliman | 2009-10-27 16:24:43 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-27 16:24:43 -0700 |
| commit | 0c466b28bbfeac8a4e0c3c61038290621c4f9f4f (patch) | |
| tree | 1647b1d98633d0f0e1aad4963522d5ed250e04ef /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-0c466b28bbfeac8a4e0c3c61038290621c4f9f4f.zip opensim-SC_OLD-0c466b28bbfeac8a4e0c3c61038290621c4f9f4f.tar.gz opensim-SC_OLD-0c466b28bbfeac8a4e0c3c61038290621c4f9f4f.tar.bz2 opensim-SC_OLD-0c466b28bbfeac8a4e0c3c61038290621c4f9f4f.tar.xz | |
Move the calculation of time dilation from the scene to the physics engine. The scene is still the one reporting dilation so this does not break the API or remove flexibility, but it gets the calculation happening in the right place for the normal OpenSim usage. The actual calculation of physics time dilation probably needs tweaking
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 82731d1..1547f9a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
| @@ -106,9 +106,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 106 | 106 | ||
| 107 | public float TimeDilation | 107 | public float TimeDilation |
| 108 | { | 108 | { |
| 109 | get { return m_timedilation; } | 109 | get { return 1.0f; } |
| 110 | } | 110 | } |
| 111 | protected float m_timedilation = 1.0f; | ||
| 112 | 111 | ||
| 113 | protected ulong m_regionHandle; | 112 | protected ulong m_regionHandle; |
| 114 | protected string m_regionName; | 113 | protected string m_regionName; |