diff options
| author | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
| commit | af0e5d097480de264e7501e7d5d35328be5640bb (patch) | |
| tree | 4ca5cd796ed9618dc9134a6e5eee1f7e7912bee4 /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | minor: remove some mono compiler warnings (diff) | |
| parent | Fixed a couple of NREs in corner cases. (diff) | |
| download | opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.zip opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.gz opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.bz2 opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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; |