diff options
| author | Melanie | 2011-10-25 01:36:39 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:36:39 +0100 |
| commit | 8e69dde3979dbe2db91221b1a977d66a8cd9bd1d (patch) | |
| tree | 041ecc3514a8882335bd49c52be240b46dace55f | |
| parent | Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge (diff) | |
| parent | When shutting down XEngine, log how many scripts are being shutdown so the us... (diff) | |
| download | opensim-SC_OLD-8e69dde3979dbe2db91221b1a977d66a8cd9bd1d.zip opensim-SC_OLD-8e69dde3979dbe2db91221b1a977d66a8cd9bd1d.tar.gz opensim-SC_OLD-8e69dde3979dbe2db91221b1a977d66a8cd9bd1d.tar.bz2 opensim-SC_OLD-8e69dde3979dbe2db91221b1a977d66a8cd9bd1d.tar.xz | |
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index cf25189..5a50714 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -684,7 +684,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 684 | lock(m_Script) | 684 | lock(m_Script) |
| 685 | { | 685 | { |
| 686 | 686 | ||
| 687 | //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this); | 687 | //m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this); |
| 688 | 688 | ||
| 689 | m_DetectParams = data.DetectParams; | 689 | m_DetectParams = data.DetectParams; |
| 690 | 690 | ||
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 975e9cc..c437703 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -1083,7 +1083,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1083 | 1083 | ||
| 1084 | IScriptInstance instance = (ScriptInstance) parms; | 1084 | IScriptInstance instance = (ScriptInstance) parms; |
| 1085 | 1085 | ||
| 1086 | //m_log.DebugFormat("[XENGINE]: Processing event for {0}", instance); | 1086 | //m_log.DebugFormat("[XEngine]: Processing event for {0}", instance); |
| 1087 | 1087 | ||
| 1088 | return instance.EventProcessor(); | 1088 | return instance.EventProcessor(); |
| 1089 | } | 1089 | } |