diff options
| author | Mic Bowman | 2011-08-19 14:49:16 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-19 14:49:16 -0700 |
| commit | 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch) | |
| tree | 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /OpenSim/Region/OptionalModules/Scripting | |
| parent | BulletSim: add runtime setting of physics parameters. Update default values. (diff) | |
| parent | Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff) | |
| download | opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz | |
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index 05c729a..963d1e2 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
| @@ -126,6 +126,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
| 126 | m_scene.EventManager.OnEmptyScriptCompileQueue -= OnEmptyScriptCompileQueue; | 126 | m_scene.EventManager.OnEmptyScriptCompileQueue -= OnEmptyScriptCompileQueue; |
| 127 | m_scene.EventManager.OnOarFileLoaded -= OnOarFileLoaded; | 127 | m_scene.EventManager.OnOarFileLoaded -= OnOarFileLoaded; |
| 128 | 128 | ||
| 129 | if(m_uri != string.Empty) | ||
| 130 | { | ||
| 131 | RRAlert("shutdown"); | ||
| 132 | } | ||
| 133 | |||
| 129 | m_scene = null; | 134 | m_scene = null; |
| 130 | } | 135 | } |
| 131 | 136 | ||