diff options
| author | KittoFlora | 2009-11-16 01:40:15 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-16 01:40:15 +0100 |
| commit | 873c9098d8627972e80a1688e85a4cda45e1e7fe (patch) | |
| tree | a0edc24aef11d5ad6928493d8985386f48dd2607 /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | Merge branch 'vehicles' into tests (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.zip opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.gz opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.bz2 opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.xz | |
Merge branch 'careminster' into tests
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; |