aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorCharles Krinke2008-06-28 16:08:12 +0000
committerCharles Krinke2008-06-28 16:08:12 +0000
commit9a0ef22ed979433f4d017a252173f38fe5e56892 (patch)
tree98bd25e3a49a38922b37728df4de9e0fa5b7366a /OpenSim/Region/Environment/Scenes/Scene.cs
parentplumbing for multiple inventory servers. Mostly done on the region server side. (diff)
downloadopensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.zip
opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.gz
opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.bz2
opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.xz
Mantis#1616. Applied Melanie's patch. This may or may
not break trunk.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index b7117df..291a7ae 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -553,7 +553,7 @@ namespace OpenSim.Region.Environment.Scenes
553 { 553 {
554 if (ent is SceneObjectGroup) 554 if (ent is SceneObjectGroup)
555 { 555 {
556 ((SceneObjectGroup)ent).StopScripts(); 556 ((SceneObjectGroup)ent).RemoveScriptInstances();
557 } 557 }
558 } 558 }
559 } 559 }
@@ -567,7 +567,7 @@ namespace OpenSim.Region.Environment.Scenes
567 { 567 {
568 if (ent is SceneObjectGroup) 568 if (ent is SceneObjectGroup)
569 { 569 {
570 ((SceneObjectGroup)ent).StartScripts(); 570 ((SceneObjectGroup)ent).CreateScriptInstances(0, false);
571 } 571 }
572 } 572 }
573 } 573 }
@@ -2029,6 +2029,8 @@ namespace OpenSim.Region.Environment.Scenes
2029 client.OnObjectGroupRequest += m_innerScene.HandleObjectGroupUpdate; 2029 client.OnObjectGroupRequest += m_innerScene.HandleObjectGroupUpdate;
2030 client.OnParcelReturnObjectsRequest += LandChannel.ReturnObjectsInParcel; 2030 client.OnParcelReturnObjectsRequest += LandChannel.ReturnObjectsInParcel;
2031 client.OnScriptReset += ProcessScriptReset; 2031 client.OnScriptReset += ProcessScriptReset;
2032 client.OnGetScriptRunning += GetScriptRunning;
2033 client.OnSetScriptRunning += SetScriptRunning;
2032 2034
2033 // EventManager.TriggerOnNewClient(client); 2035 // EventManager.TriggerOnNewClient(client);
2034 } 2036 }