From 557b0fae8537332e6580d8290f004ae403f062b9 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Thu, 29 Jan 2015 18:28:17 +0000 Subject: [PATCH] minor: correct log message when script with non-config stop strategy is detected to log actual strategy rather than true/false --- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 932af400dc..54620d1c24 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -1460,7 +1460,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine m_log.WarnFormat( "[XEngine]: At least one existing compiled script DLL in {0} has {1} as ScriptStopStrategy whereas config setting is {2}." + "\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).", - World.Name, coopTerminationForThisScript ? "co-op" : "abort", m_coopTermination); + World.Name, coopTerminationForThisScript ? "co-op" : "abort", m_coopTermination ? "co-op" : "abort"); HaveNotifiedLogOfScriptStopMistmatch = true; }