diff options
author | Robert Adams | 2013-05-03 14:25:52 -0700 |
---|---|---|
committer | Robert Adams | 2013-05-03 14:25:52 -0700 |
commit | 1ffa69f691449fb240327505c94b18d4bf63c103 (patch) | |
tree | d2c0c028badd4c491418845a56e9582c62dfacf2 /OpenSim/Region/Application/OpenSimBase.cs | |
parent | BulletSim: zero vehicle motion when changing vehicle type. (diff) | |
parent | Fix possible race condition with local region cache if a region was added aft... (diff) | |
download | opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.zip opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.tar.gz opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.tar.bz2 opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.tar.xz |
Merge branch 'master' into bulletsim4
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index d86eefe..f9e0cf1 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -425,9 +425,6 @@ namespace OpenSim | |||
425 | 425 | ||
426 | mscene = scene; | 426 | mscene = scene; |
427 | 427 | ||
428 | scene.Start(); | ||
429 | scene.StartScripts(); | ||
430 | |||
431 | return clientServers; | 428 | return clientServers; |
432 | } | 429 | } |
433 | 430 | ||
@@ -751,6 +748,7 @@ namespace OpenSim | |||
751 | ShutdownClientServer(whichRegion); | 748 | ShutdownClientServer(whichRegion); |
752 | IScene scene; | 749 | IScene scene; |
753 | CreateRegion(whichRegion, true, out scene); | 750 | CreateRegion(whichRegion, true, out scene); |
751 | scene.Start(); | ||
754 | } | 752 | } |
755 | 753 | ||
756 | # region Setup methods | 754 | # region Setup methods |