aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2013-05-04 01:22:12 +0100
committerMelanie2013-05-04 01:22:12 +0100
commit3aa83738e2a845d05bb25ab81634d0540971c0bf (patch)
tree411d946b817b020c72f3d9a35926215e28bf2d95 /OpenSim/Region/Application
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' into bulletsim4 (diff)
downloadopensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.zip
opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.gz
opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.bz2
opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index cd2338d..0ed85b8 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -504,9 +504,6 @@ namespace OpenSim
504 scene.SnmpService.LinkUp(scene); 504 scene.SnmpService.LinkUp(scene);
505 } 505 }
506 506
507 scene.Start();
508 scene.StartScripts();
509
510 return clientServers; 507 return clientServers;
511 } 508 }
512 509
@@ -835,6 +832,7 @@ namespace OpenSim
835 ShutdownClientServer(whichRegion); 832 ShutdownClientServer(whichRegion);
836 IScene scene; 833 IScene scene;
837 CreateRegion(whichRegion, true, out scene); 834 CreateRegion(whichRegion, true, out scene);
835 scene.Start();
838 } 836 }
839 837
840 # region Setup methods 838 # region Setup methods