diff options
author | Justin Clark-Casey (justincc) | 2015-01-29 18:28:17 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2015-01-29 18:28:17 +0000 |
commit | 557b0fae8537332e6580d8290f004ae403f062b9 (patch) | |
tree | cb908ab65240f6a67cd598708829a6f5c859d4ca /OpenSim | |
parent | Avoid a possible race condition by serializing plugin data outside the EventQ... (diff) | |
download | opensim-SC-557b0fae8537332e6580d8290f004ae403f062b9.zip opensim-SC-557b0fae8537332e6580d8290f004ae403f062b9.tar.gz opensim-SC-557b0fae8537332e6580d8290f004ae403f062b9.tar.bz2 opensim-SC-557b0fae8537332e6580d8290f004ae403f062b9.tar.xz |
minor: correct log message when script with non-config stop strategy is detected to log actual strategy rather than true/false
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 932af40..54620d1 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -1460,7 +1460,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1460 | m_log.WarnFormat( | 1460 | m_log.WarnFormat( |
1461 | "[XEngine]: At least one existing compiled script DLL in {0} has {1} as ScriptStopStrategy whereas config setting is {2}." | 1461 | "[XEngine]: At least one existing compiled script DLL in {0} has {1} as ScriptStopStrategy whereas config setting is {2}." |
1462 | + "\nContinuing with script compiled strategy but to remove this message please set [XEngine] DeleteScriptsOnStartup = true for one simulator session to remove old script DLLs (script state will not be lost).", | 1462 | + "\nContinuing with script compiled strategy but to remove this message please set [XEngine] DeleteScriptsOnStartup = true for one simulator session to remove old script DLLs (script state will not be lost).", |
1463 | World.Name, coopTerminationForThisScript ? "co-op" : "abort", m_coopTermination); | 1463 | World.Name, coopTerminationForThisScript ? "co-op" : "abort", m_coopTermination ? "co-op" : "abort"); |
1464 | 1464 | ||
1465 | HaveNotifiedLogOfScriptStopMistmatch = true; | 1465 | HaveNotifiedLogOfScriptStopMistmatch = true; |
1466 | } | 1466 | } |