aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorDan Lake2012-07-18 13:07:07 -0700
committerDan Lake2012-07-18 13:07:07 -0700
commitdd85d7d981a93b44c264695020768f8b7399ab31 (patch)
treee5d31df36914e3e330c9b7333d200145a57d2bd8 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentMissing parameter in log error message was throwing exception (diff)
parentClose() the ScenePresence after we've removed it from the scene graph, to cut... (diff)
downloadopensim-SC_OLD-dd85d7d981a93b44c264695020768f8b7399ab31.zip
opensim-SC_OLD-dd85d7d981a93b44c264695020768f8b7399ab31.tar.gz
opensim-SC_OLD-dd85d7d981a93b44c264695020768f8b7399ab31.tar.bz2
opensim-SC_OLD-dd85d7d981a93b44c264695020768f8b7399ab31.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs14
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 9ff8467..e413281 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2143,24 +2143,10 @@ namespace OpenSim.Region.Framework.Scenes
2143 if (part == null) 2143 if (part == null)
2144 return; 2144 return;
2145 2145
2146 IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>();
2147
2148 if (running) 2146 if (running)
2149 {
2150 foreach (IScriptModule engine in engines)
2151 {
2152 engine.SetRunEnable(itemID, true);
2153 }
2154 EventManager.TriggerStartScript(part.LocalId, itemID); 2147 EventManager.TriggerStartScript(part.LocalId, itemID);
2155 }
2156 else 2148 else
2157 {
2158 foreach (IScriptModule engine in engines)
2159 {
2160 engine.SetRunEnable(itemID, false);
2161 }
2162 EventManager.TriggerStopScript(part.LocalId, itemID); 2149 EventManager.TriggerStopScript(part.LocalId, itemID);
2163 }
2164 } 2150 }
2165 2151
2166 public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) 2152 public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)