aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-30 14:57:05 +0000
committerMelanie Thielker2008-09-30 14:57:05 +0000
commitf0564549a9517d9b15a46ed6bf990a577c1ac935 (patch)
treeacb98fe3baf531fcdfe25ba87c3c16c92099234b
parentAdd the default script engine to the script creation from archive loading (diff)
downloadopensim-SC-f0564549a9517d9b15a46ed6bf990a577c1ac935.zip
opensim-SC-f0564549a9517d9b15a46ed6bf990a577c1ac935.tar.gz
opensim-SC-f0564549a9517d9b15a46ed6bf990a577c1ac935.tar.bz2
opensim-SC-f0564549a9517d9b15a46ed6bf990a577c1ac935.tar.xz
Add two more default script engine params
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
index 334d895..af69707 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, ""); 183 sceneObject.CreateScriptInstances(0, true, scene.DefaultScriptEngine);
184 } 184 }
185 } 185 }
186 186
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 1c421b7..cd5a9f5 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1604,7 +1604,7 @@ namespace OpenSim.Region.Environment.Scenes
1604 copy.UpdateGroupRotation(rot); 1604 copy.UpdateGroupRotation(rot);
1605 } 1605 }
1606 1606
1607 copy.CreateScriptInstances(0, false, ""); 1607 copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine);
1608 copy.HasGroupChanged = true; 1608 copy.HasGroupChanged = true;
1609 copy.ScheduleGroupForFullUpdate(); 1609 copy.ScheduleGroupForFullUpdate();
1610 return copy; 1610 return copy;