aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Archiver
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-07 18:54:11 +0000
committerJustin Clarke Casey2008-07-07 18:54:11 +0000
commit0b2fcbfec4ae06b3e3f278d9e42f84c88f556587 (patch)
tree0a62ef6c55651582adba93b7bd003384f4f9db03 /OpenSim/Region/Environment/Modules/World/Archiver
parent* switch terrain archiving to raw32 rather than png to avoid unnecessary post... (diff)
downloadopensim-SC_OLD-0b2fcbfec4ae06b3e3f278d9e42f84c88f556587.zip
opensim-SC_OLD-0b2fcbfec4ae06b3e3f278d9e42f84c88f556587.tar.gz
opensim-SC_OLD-0b2fcbfec4ae06b3e3f278d9e42f84c88f556587.tar.bz2
opensim-SC_OLD-0b2fcbfec4ae06b3e3f278d9e42f84c88f556587.tar.xz
* Start scripts loaded from an archive
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 15bc265..0f179f4 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -100,10 +100,18 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
100 m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects", serialisedSceneObjects.Count); 100 m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects", serialisedSceneObjects.Count);
101 101
102 IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>(); 102 IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>();
103 ICollection<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
103 104
104 foreach (string serialisedSceneObject in serialisedSceneObjects) 105 foreach (string serialisedSceneObject in serialisedSceneObjects)
105 { 106 {
106 serialiser.LoadGroupFromXml2(m_scene, serialisedSceneObject); 107 sceneObjects.Add(serialiser.LoadGroupFromXml2(m_scene, serialisedSceneObject));
108 }
109
110 m_log.Debug("[ARCHIVER]: Starting scripts");
111
112 foreach (SceneObjectGroup sceneObject in sceneObjects)
113 {
114 sceneObject.CreateScriptInstances(0, true);
107 } 115 }
108 116
109 m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); 117 m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive");
@@ -126,7 +134,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
126 { 134 {
127 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension]; 135 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
128 136
129 m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); 137 m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
130 138
131 AssetBase asset = new AssetBase(new LLUUID(uuid), String.Empty); 139 AssetBase asset = new AssetBase(new LLUUID(uuid), String.Empty);
132 asset.Type = assetType; 140 asset.Type = assetType;