aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-31 22:24:11 +0200
committerMelanie2010-08-31 22:36:46 +0100
commitc47de942637281714c3e85bfc8b3af4405713fd3 (patch)
tree3a6c339bcf4439b7541d769c75689dd117cf58bf /OpenSim/Region
parentminor: Add some method doc to BaseHttpServer.HandleRequest() (diff)
downloadopensim-SC_OLD-c47de942637281714c3e85bfc8b3af4405713fd3.zip
opensim-SC_OLD-c47de942637281714c3e85bfc8b3af4405713fd3.tar.gz
opensim-SC_OLD-c47de942637281714c3e85bfc8b3af4405713fd3.tar.bz2
opensim-SC_OLD-c47de942637281714c3e85bfc8b3af4405713fd3.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 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs2
4 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 6decf54..2ac2324 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -641,7 +641,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
641 } 641 }
642 642
643 // Fire on_rez 643 // Fire on_rez
644 group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 0); 644 group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
645 rootPart.ParentGroup.ResumeScripts(); 645 rootPart.ParentGroup.ResumeScripts();
646 646
647 rootPart.ScheduleFullUpdate(); 647 rootPart.ScheduleFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 2ac46e2..0674e62 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1940,7 +1940,7 @@ namespace OpenSim.Region.Framework.Scenes
1940 1940
1941 // We can only call this after adding the scene object, since the scene object references the scene 1941 // We can only call this after adding the scene object, since the scene object references the scene
1942 // to find out if scripts should be activated at all. 1942 // to find out if scripts should be activated at all.
1943 group.CreateScriptInstances(param, true, DefaultScriptEngine, 2); 1943 group.CreateScriptInstances(param, true, DefaultScriptEngine, 3);
1944 1944
1945 group.ScheduleGroupForFullUpdate(); 1945 group.ScheduleGroupForFullUpdate();
1946 1946
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index db081cc..56ac2c2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2376,7 +2376,7 @@ namespace OpenSim.Region.Framework.Scenes
2376 return false; 2376 return false;
2377 } 2377 }
2378 2378
2379 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, 1); 2379 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, 2);
2380 2380
2381 newObject.ResumeScripts(); 2381 newObject.ResumeScripts();
2382 2382
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 2c242c9..e7175c5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1845,7 +1845,7 @@ namespace OpenSim.Region.Framework.Scenes
1845 copy.UpdateGroupRotationR(rot); 1845 copy.UpdateGroupRotationR(rot);
1846 } 1846 }
1847 1847
1848 copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 0); 1848 copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 1);
1849 copy.HasGroupChanged = true; 1849 copy.HasGroupChanged = true;
1850 copy.ScheduleGroupForFullUpdate(); 1850 copy.ScheduleGroupForFullUpdate();
1851 copy.ResumeScripts(); 1851 copy.ResumeScripts();