diff options
| author | Melanie | 2009-10-27 11:32:11 +0000 |
|---|---|---|
| committer | Melanie | 2009-10-27 11:32:11 +0000 |
| commit | 31a848e97bd984ab0a85feca397ce419f6ae839a (patch) | |
| tree | 4743f5eb7c12b3723ed4b986d19714d1b3a0a3ea /OpenSim/Framework/IScene.cs | |
| parent | Commented out instrumentation in ODEPrim.cs (diff) | |
| parent | Finally hunted down the Parallel deadlock. Packets were being handled asynchr... (diff) | |
| download | opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.zip opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.gz opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.bz2 opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Framework/IScene.cs')
| -rw-r--r-- | OpenSim/Framework/IScene.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index f34027d..8067052 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
| @@ -62,7 +62,6 @@ namespace OpenSim.Framework | |||
| 62 | RegionInfo RegionInfo { get; } | 62 | RegionInfo RegionInfo { get; } |
| 63 | RegionStatus RegionStatus { get; set; } | 63 | RegionStatus RegionStatus { get; set; } |
| 64 | 64 | ||
| 65 | ClientManager ClientManager { get; } | ||
| 66 | IConfigSource Config { get; } | 65 | IConfigSource Config { get; } |
| 67 | 66 | ||
| 68 | float TimeDilation { get; } | 67 | float TimeDilation { get; } |