diff options
| author | Melanie | 2009-11-26 17:45:09 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-26 17:45:09 +0000 |
| commit | ed148eba324cf72b4100f83f6d5f7cb35cb46bba (patch) | |
| tree | b8f813d74183776a70b6752e5b409dcc169de019 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.zip opensim-SC_OLD-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.gz opensim-SC_OLD-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.bz2 opensim-SC_OLD-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 5b13b73..3034f9a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -387,6 +387,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 387 | { | 387 | { |
| 388 | get { return StatsReporter.getLastReportedSimFPS(); } | 388 | get { return StatsReporter.getLastReportedSimFPS(); } |
| 389 | } | 389 | } |
| 390 | |||
| 391 | public float[] SimulatorStats | ||
| 392 | { | ||
| 393 | get { return StatsReporter.getLastReportedSimStats(); } | ||
| 394 | } | ||
| 390 | 395 | ||
| 391 | public string DefaultScriptEngine | 396 | public string DefaultScriptEngine |
| 392 | { | 397 | { |