aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-11-22 02:20:10 -0800
committeropensim mirror account2010-11-22 02:20:10 -0800
commitd272a5bd25a89f4c201c0daeeae7f5568116f555 (patch)
treeab3f864183117826c74dbe227ea8c3f10832e484
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentThank you, thomax, for a patch making changed events CHANGED_REGION_RESTART a... (diff)
downloadopensim-SC_OLD-d272a5bd25a89f4c201c0daeeae7f5568116f555.zip
opensim-SC_OLD-d272a5bd25a89f4c201c0daeeae7f5568116f555.tar.gz
opensim-SC_OLD-d272a5bd25a89f4c201c0daeeae7f5568116f555.tar.bz2
opensim-SC_OLD-d272a5bd25a89f4c201c0daeeae7f5568116f555.tar.xz
Merge branch 'master' of /var/git/opensim/
-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