diff options
| author | BlueWall | 2012-03-22 21:27:03 -0400 |
|---|---|---|
| committer | BlueWall | 2012-03-22 21:27:03 -0400 |
| commit | c0672cb7dbceee42f452ef869432507bc473f3b2 (patch) | |
| tree | fcd2169872f913de7d4c38942e09b35856a8f294 /OpenSim/Region/Application | |
| parent | Merge branch 'master' of /home/opensim/src/opensim (diff) | |
| parent | Rename Scene.StartTimer() to Start() - this method no longer uses a timer. C... (diff) | |
| download | opensim-SC-c0672cb7dbceee42f452ef869432507bc473f3b2.zip opensim-SC-c0672cb7dbceee42f452ef869432507bc473f3b2.tar.gz opensim-SC-c0672cb7dbceee42f452ef869432507bc473f3b2.tar.bz2 opensim-SC-c0672cb7dbceee42f452ef869432507bc473f3b2.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index c6956fc..484159c 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -430,7 +430,7 @@ namespace OpenSim | |||
| 430 | 430 | ||
| 431 | mscene = scene; | 431 | mscene = scene; |
| 432 | 432 | ||
| 433 | scene.StartTimer(); | 433 | scene.Start(); |
| 434 | 434 | ||
| 435 | scene.StartScripts(); | 435 | scene.StartScripts(); |
| 436 | 436 | ||