diff options
| author | Melanie | 2010-01-03 21:43:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-03 21:43:39 +0000 |
| commit | 61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11 (patch) | |
| tree | 7780b88dc26de91fe0b95a0a234a7f995adf5d22 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Add virtual method StateChange to ScriptBaseClass (diff) | |
| parent | Cause llSetText to send prim updates. (diff) | |
| download | opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.zip opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.gz opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.bz2 opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.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 | 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 2e34d1c..adf5f02 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -387,11 +387,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 387 | { | 387 | { |
| 388 | get { return StatsReporter.getLastReportedSimFPS(); } | 388 | get { return StatsReporter.getLastReportedSimFPS(); } |
| 389 | } | 389 | } |
| 390 | 390 | ||
| 391 | public float[] SimulatorStats | 391 | public float[] SimulatorStats |
| 392 | { | 392 | { |
| 393 | get { return StatsReporter.getLastReportedSimStats(); } | 393 | get { return StatsReporter.getLastReportedSimStats(); } |
| 394 | } | 394 | } |
| 395 | 395 | ||
| 396 | public string DefaultScriptEngine | 396 | public string DefaultScriptEngine |
| 397 | { | 397 | { |