diff options
| author | Justin Clark-Casey (justincc) | 2010-04-19 21:28:30 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-19 21:28:30 +0100 |
| commit | 6b963e73d954b9ae8a6d283b5c83460d6a192ba6 (patch) | |
| tree | f7c3db7ccb54a27cdb4ed5d38645275792c56266 /OpenSim/Region/CoreModules/World | |
| parent | Make the "notecard saved" text appear in the saver rather than the notecard o... (diff) | |
| parent | Avoid duplicate script resumes. Move resume calls to more logical places (diff) | |
| download | opensim-SC-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.zip opensim-SC-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.tar.gz opensim-SC-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.tar.bz2 opensim-SC-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 55028d0..c52f029 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
| @@ -284,6 +284,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 284 | { | 284 | { |
| 285 | sceneObjectsLoadedCount++; | 285 | sceneObjectsLoadedCount++; |
| 286 | sceneObject.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, 0); | 286 | sceneObject.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, 0); |
| 287 | sceneObject.ResumeScripts(); | ||
| 287 | } | 288 | } |
| 288 | } | 289 | } |
| 289 | 290 | ||