diff options
| author | KittoFlora | 2009-10-27 22:42:55 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-10-27 22:42:55 +0100 |
| commit | 1113b3b6ebba3e358326a7be90b338d8c95af688 (patch) | |
| tree | d923340600e5a2699ceaceeb52fd6c45994f334a /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | llRotLookAt Pt 2 (diff) | |
| parent | Merge branch 'master' into vehicles (diff) | |
| download | opensim-SC_OLD-1113b3b6ebba3e358326a7be90b338d8c95af688.zip opensim-SC_OLD-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.gz opensim-SC_OLD-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.bz2 opensim-SC_OLD-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.xz | |
Merge branch 'vehicles' into tests
Conflicts:
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index cf5c3c8..82731d1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
| @@ -102,12 +102,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 102 | 102 | ||
| 103 | private readonly Mutex _primAllocateMutex = new Mutex(false); | 103 | private readonly Mutex _primAllocateMutex = new Mutex(false); |
| 104 | 104 | ||
| 105 | private readonly ClientManager m_clientManager = new ClientManager(); | 105 | protected readonly ClientManager m_clientManager = new ClientManager(); |
| 106 | |||
| 107 | public ClientManager ClientManager | ||
| 108 | { | ||
| 109 | get { return m_clientManager; } | ||
| 110 | } | ||
| 111 | 106 | ||
| 112 | public float TimeDilation | 107 | public float TimeDilation |
| 113 | { | 108 | { |