diff options
| author | Melanie Thielker | 2008-11-09 19:30:40 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-09 19:30:40 +0000 |
| commit | 664e8a464e4608afeb590a3330ccc69e7988138b (patch) | |
| tree | 099c17a1769a7e7ac16232c5a20f5d9515a1d480 /OpenSim/Region/Environment/Modules/World | |
| parent | Cause llGetInventoryType to return the asset type, which corresponds with (diff) | |
| download | opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.zip opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.tar.gz opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.tar.bz2 opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.tar.xz | |
Script region crossing. This has not user functionality, but lays all the
groundwork.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index 2fe36a8..11024d6 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | |||
| @@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
| 192 | 192 | ||
| 193 | foreach (SceneObjectGroup sceneObject in sceneObjects) | 193 | foreach (SceneObjectGroup sceneObject in sceneObjects) |
| 194 | { | 194 | { |
| 195 | sceneObject.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine); | 195 | sceneObject.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 0); |
| 196 | } | 196 | } |
| 197 | } | 197 | } |
| 198 | 198 | ||
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs index a069ac3..c856b5b 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | |||
| @@ -180,7 +180,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 180 | 180 | ||
| 181 | foreach (SceneObjectGroup sceneObject in sceneObjects) | 181 | foreach (SceneObjectGroup sceneObject in sceneObjects) |
| 182 | { | 182 | { |
| 183 | sceneObject.CreateScriptInstances(0, true, scene.DefaultScriptEngine); | 183 | sceneObject.CreateScriptInstances(0, true, scene.DefaultScriptEngine, 0); |
| 184 | } | 184 | } |
| 185 | } | 185 | } |
| 186 | 186 | ||