diff options
| author | John Hurliman | 2010-04-22 18:56:06 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-04-22 18:56:06 -0700 |
| commit | 8692ac53f56c8db9942021709e7415b2b2add0c6 (patch) | |
| tree | 5681611d23f8f89b38d2c19ef032d412fd3fe3d2 /OpenSim/Region/Framework/Scenes/Serialization | |
| parent | * Better error logging for failed SimianGrid web service calls (diff) | |
| parent | Insert a ROLLBACK command on migration step failure. This ensures that (diff) | |
| download | opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.zip opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.gz opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.bz2 opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index cf0f345..b6677f0 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |||
| @@ -182,6 +182,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 182 | foreach (SceneObjectGroup sceneObject in sceneObjects) | 182 | foreach (SceneObjectGroup sceneObject in sceneObjects) |
| 183 | { | 183 | { |
| 184 | sceneObject.CreateScriptInstances(0, true, scene.DefaultScriptEngine, 0); | 184 | sceneObject.CreateScriptInstances(0, true, scene.DefaultScriptEngine, 0); |
| 185 | sceneObject.ResumeScripts(); | ||
| 185 | } | 186 | } |
| 186 | } | 187 | } |
| 187 | 188 | ||