diff options
author | Melanie Thielker | 2010-08-31 22:24:11 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-08-31 22:24:11 +0200 |
commit | b973fe52976c909197c360d6afdd62952e3d37ae (patch) | |
tree | 895a14c09c4d0e602b7605f5c317d9ebe094951d /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-b973fe52976c909197c360d6afdd62952e3d37ae.zip opensim-SC-b973fe52976c909197c360d6afdd62952e3d37ae.tar.gz opensim-SC-b973fe52976c909197c360d6afdd62952e3d37ae.tar.bz2 opensim-SC-b973fe52976c909197c360d6afdd62952e3d37ae.tar.xz |
Adjust the "Magic numbers" we use because we can't reference the actual
script state enum to reflect recent changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 8760c84..ffbf7bf 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1993,7 +1993,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1993 | 1993 | ||
1994 | // We can only call this after adding the scene object, since the scene object references the scene | 1994 | // We can only call this after adding the scene object, since the scene object references the scene |
1995 | // to find out if scripts should be activated at all. | 1995 | // to find out if scripts should be activated at all. |
1996 | group.CreateScriptInstances(param, true, DefaultScriptEngine, 2); | 1996 | group.CreateScriptInstances(param, true, DefaultScriptEngine, 3); |
1997 | 1997 | ||
1998 | group.ScheduleGroupForFullUpdate(); | 1998 | group.ScheduleGroupForFullUpdate(); |
1999 | 1999 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6a742c1..767d370 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2442,7 +2442,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2442 | return false; | 2442 | return false; |
2443 | } | 2443 | } |
2444 | 2444 | ||
2445 | newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, 1); | 2445 | newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, 2); |
2446 | 2446 | ||
2447 | newObject.ResumeScripts(); | 2447 | newObject.ResumeScripts(); |
2448 | 2448 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index b86a564..8823df1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1928 | copy.UpdateGroupRotationR(rot); | 1928 | copy.UpdateGroupRotationR(rot); |
1929 | } | 1929 | } |
1930 | 1930 | ||
1931 | copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 0); | 1931 | copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 1); |
1932 | copy.HasGroupChanged = true; | 1932 | copy.HasGroupChanged = true; |
1933 | copy.ScheduleGroupForFullUpdate(); | 1933 | copy.ScheduleGroupForFullUpdate(); |
1934 | copy.ResumeScripts(); | 1934 | copy.ResumeScripts(); |