aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAlan M Webb2009-09-16 09:39:07 -0400
committerdr scofield (aka dirk husemann)2009-09-16 16:29:52 +0200
commit3403ae81e80150c4c1e09f23c914c6fb3b499769 (patch)
treec9d7801f92ad94f204aa54201ce8c0bf71773e0f /OpenSim/Region
parentAnd another go (diff)
downloadopensim-SC_OLD-3403ae81e80150c4c1e09f23c914c6fb3b499769.zip
opensim-SC_OLD-3403ae81e80150c4c1e09f23c914c6fb3b499769.tar.gz
opensim-SC_OLD-3403ae81e80150c4c1e09f23c914c6fb3b499769.tar.bz2
opensim-SC_OLD-3403ae81e80150c4c1e09f23c914c6fb3b499769.tar.xz
Stop a loaded OAR from generating on_rez events. This brings
the OAR loader in line with region restart (and the correct behavior).
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs2
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 150798b..376ea8a 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
243 if (m_scene.AddRestoredSceneObject(sceneObject, true, false)) 243 if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
244 { 244 {
245 sceneObjectsLoadedCount++; 245 sceneObjectsLoadedCount++;
246 sceneObject.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 0); 246 sceneObject.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, 0);
247 } 247 }
248 } 248 }
249 249