aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance
diff options
context:
space:
mode:
authorJonathan Freedman2010-11-23 22:27:54 -0800
committerJonathan Freedman2010-11-23 22:27:54 -0800
commitbc51dfc45eb73e34d91fd72d0a537ffc907a9da6 (patch)
tree084062cd82e16edbff08a5e3b705458d915caf86 /OpenSim/Region/ScriptEngine/Shared/Instance
parentMerge branch 'master-core' into mantis5110 (diff)
parentMerge branch 'master' of /var/git/opensim/ (diff)
downloadopensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.zip
opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.gz
opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.bz2
opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.xz
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
-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 6663aa5..660e9a3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -392,13 +392,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
392 { 392 {
393// m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script"); 393// m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script");
394 PostEvent(new EventParams("changed", 394 PostEvent(new EventParams("changed",
395 new Object[] { (int)Changed.REGION_RESTART }, new DetectParams[0])); 395 new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION_RESTART) },
396 new DetectParams[0]));
396 } 397 }
397 else if (m_stateSource == StateSource.PrimCrossing) 398 else if (m_stateSource == StateSource.PrimCrossing)
398 { 399 {
399 // CHANGED_REGION 400 // CHANGED_REGION
400 PostEvent(new EventParams("changed", 401 PostEvent(new EventParams("changed",
401 new Object[] { (int)Changed.REGION }, new DetectParams[0])); 402 new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION) },
403 new DetectParams[0]));
402 } 404 }
403 } 405 }
404 else 406 else