aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2010-11-22 14:14:45 +0000
committerMelanie2010-11-22 14:14:45 +0000
commit87f30709a246f72fd8a511ed9a76a17aac072ce2 (patch)
tree44b8ff802ff4cef1e8f5ed5e9e2d67f04a67a499 /OpenSim/Region/ScriptEngine
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentChange FS Voice module to a shared module to avoid gratuitious server handler (diff)
downloadopensim-SC_OLD-87f30709a246f72fd8a511ed9a76a17aac072ce2.zip
opensim-SC_OLD-87f30709a246f72fd8a511ed9a76a17aac072ce2.tar.gz
opensim-SC_OLD-87f30709a246f72fd8a511ed9a76a17aac072ce2.tar.bz2
opensim-SC_OLD-87f30709a246f72fd8a511ed9a76a17aac072ce2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 623cb7d..5288cd3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -393,13 +393,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
393 { 393 {
394// m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script"); 394// m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script");
395 PostEvent(new EventParams("changed", 395 PostEvent(new EventParams("changed",
396 new Object[] { (int)Changed.REGION_RESTART }, new DetectParams[0])); 396 new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION_RESTART) },
397 new DetectParams[0]));
397 } 398 }
398 else if (m_stateSource == StateSource.PrimCrossing) 399 else if (m_stateSource == StateSource.PrimCrossing)
399 { 400 {
400 // CHANGED_REGION 401 // CHANGED_REGION
401 PostEvent(new EventParams("changed", 402 PostEvent(new EventParams("changed",
402 new Object[] { (int)Changed.REGION }, new DetectParams[0])); 403 new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION) },
404 new DetectParams[0]));
403 } 405 }
404 } 406 }
405 else 407 else