diff options
| author | Melanie | 2013-05-04 01:22:12 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-04 01:22:12 +0100 |
| commit | 3aa83738e2a845d05bb25ab81634d0540971c0bf (patch) | |
| tree | 411d946b817b020c72f3d9a35926215e28bf2d95 /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' into bulletsim4 (diff) | |
| download | opensim-SC-3aa83738e2a845d05bb25ab81634d0540971c0bf.zip opensim-SC-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.gz opensim-SC-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.bz2 opensim-SC-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/Framework/Scenes/SceneBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 74c9582..4eef162 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
| @@ -562,6 +562,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 562 | get { return false; } | 562 | get { return false; } |
| 563 | } | 563 | } |
| 564 | 564 | ||
| 565 | public virtual void Start() | ||
| 566 | { | ||
| 567 | } | ||
| 568 | |||
| 565 | public void Restart() | 569 | public void Restart() |
| 566 | { | 570 | { |
| 567 | // This has to be here to fire the event | 571 | // This has to be here to fire the event |