diff options
| author | Justin Clark-Casey (justincc) | 2010-05-24 16:53:43 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-05-24 16:53:43 +0100 |
| commit | 2603f9a134ca3a3e5ed823d4f670feeab02537e7 (patch) | |
| tree | 479183c6c7694e6b573272069dae578c261cad87 /OpenSim | |
| parent | Apply http://opensimulator.org/mantis/view.php?id=4724 (diff) | |
| download | opensim-SC-2603f9a134ca3a3e5ed823d4f670feeab02537e7.zip opensim-SC-2603f9a134ca3a3e5ed823d4f670feeab02537e7.tar.gz opensim-SC-2603f9a134ca3a3e5ed823d4f670feeab02537e7.tar.bz2 opensim-SC-2603f9a134ca3a3e5ed823d4f670feeab02537e7.tar.xz | |
stop "load oar" reporting ignored objects when those objects were actually loaded just fine
this fix also means that loaded scripts are properly/more promptly started
here, the fix is only done in the oar module. In master, the underlying problem was fixed instead but this is more invasive.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 381c8f7..2e30e09 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
| @@ -276,7 +276,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 276 | } | 276 | } |
| 277 | } | 277 | } |
| 278 | 278 | ||
| 279 | if (m_scene.AddRestoredSceneObject(sceneObject, true, false)) | 279 | if (!m_scene.AddRestoredSceneObject(sceneObject, true, false)) |
| 280 | { | 280 | { |
| 281 | sceneObjectsLoadedCount++; | 281 | sceneObjectsLoadedCount++; |
| 282 | sceneObject.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, 0); | 282 | sceneObject.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, 0); |