diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ae189b5..20c0622 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -400,11 +400,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 400 | { | 400 | { |
| 401 | get { return StatsReporter.getLastReportedSimFPS(); } | 401 | get { return StatsReporter.getLastReportedSimFPS(); } |
| 402 | } | 402 | } |
| 403 | 403 | ||
| 404 | public float[] SimulatorStats | 404 | public float[] SimulatorStats |
| 405 | { | 405 | { |
| 406 | get { return StatsReporter.getLastReportedSimStats(); } | 406 | get { return StatsReporter.getLastReportedSimStats(); } |
| 407 | } | 407 | } |
| 408 | 408 | ||
| 409 | public string DefaultScriptEngine | 409 | public string DefaultScriptEngine |
| 410 | { | 410 | { |