aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorTom2010-08-06 08:09:10 -0700
committerTom2010-08-06 08:09:10 -0700
commit0d4086e6025d2d6ccbf1339a22a443eb746e834f (patch)
tree5a9c8a75ec34ccdea292cbc947655d36cd4eb09e /OpenSim/Region/ScriptEngine
parentSince i've narrowed the fault down to one function, add some spammy debug to ... (diff)
parentChange XEngine to use the new constant (diff)
downloadopensim-SC-0d4086e6025d2d6ccbf1339a22a443eb746e834f.zip
opensim-SC-0d4086e6025d2d6ccbf1339a22a443eb746e834f.tar.gz
opensim-SC-0d4086e6025d2d6ccbf1339a22a443eb746e834f.tar.bz2
opensim-SC-0d4086e6025d2d6ccbf1339a22a443eb746e834f.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index dcbe0c4..b4da246 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -388,7 +388,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
388 PostEvent(new EventParams("attach", 388 PostEvent(new EventParams("attach",
389 new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0])); 389 new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0]));
390 } 390 }
391 else if (m_stateSource == StateSource.NewRez) 391 else if (m_stateSource == StateSource.RegionStart)
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",