diff options
Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 529dc9e..80d7871 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -532,19 +532,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
532 | get { return m_sceneGraph.m_syncRoot; } | 532 | get { return m_sceneGraph.m_syncRoot; } |
533 | } | 533 | } |
534 | 534 | ||
535 | /// <summary> | ||
536 | /// This is for llGetRegionFPS | ||
537 | /// </summary> | ||
538 | public float SimulatorFPS | ||
539 | { | ||
540 | get { return StatsReporter.getLastReportedSimFPS(); } | ||
541 | } | ||
542 | |||
543 | public float[] SimulatorStats | ||
544 | { | ||
545 | get { return StatsReporter.getLastReportedSimStats(); } | ||
546 | } | ||
547 | |||
548 | public string DefaultScriptEngine | 535 | public string DefaultScriptEngine |
549 | { | 536 | { |
550 | get { return m_defaultScriptEngine; } | 537 | get { return m_defaultScriptEngine; } |