aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
diff options
context:
space:
mode:
authorMelanie2009-10-02 19:04:46 +0100
committerMelanie2009-10-02 19:04:46 +0100
commit46955f42608ceb2b76731432f536e04e85521a12 (patch)
tree37e8591bd95de33ad0c485626c6f40f7d4bd91b5 /OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
parentRevert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... (diff)
parentAdded a default for grid services in standalone. (diff)
downloadopensim-SC-46955f42608ceb2b76731432f536e04e85521a12.zip
opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.gz
opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.bz2
opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index dc49549..4e13fb3 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -305,9 +305,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
305 if (engine != myScriptEngine.ScriptEngineName) 305 if (engine != myScriptEngine.ScriptEngineName)
306 return; 306 return;
307 307
308 m_log.Debug("OnRezScript localID: " + localID + 308 // m_log.Debug("OnRezScript localID: " + localID +
309 " LLUID: " + itemID.ToString() + " Size: " + 309 // " LLUID: " + itemID.ToString() + " Size: " +
310 script.Length); 310 // script.Length);
311 311
312 myScriptEngine.m_ScriptManager.StartScript(localID, itemID, script, 312 myScriptEngine.m_ScriptManager.StartScript(localID, itemID, script,
313 startParam, postOnRez); 313 startParam, postOnRez);
@@ -315,7 +315,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
315 315
316 public void OnRemoveScript(uint localID, UUID itemID) 316 public void OnRemoveScript(uint localID, UUID itemID)
317 { 317 {
318 m_log.Debug("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString()); 318 // m_log.Debug("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString());
319 myScriptEngine.m_ScriptManager.StopScript( 319 myScriptEngine.m_ScriptManager.StopScript(
320 localID, 320 localID,
321 itemID 321 itemID