diff options
| author | UbitUmarov | 2017-09-04 18:39:42 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-09-04 18:39:42 +0100 |
| commit | 86493d75fa6457f45942950f22ffcea391702c6a (patch) | |
| tree | b5f9f467b8cd5737d49742e857cb2f5f2d2c7204 /OpenSim/Region | |
| parent | fix our name is OpenSimulator not OpenSim (diff) | |
| parent | Fixed typos in comments in osslEnable.ini (diff) | |
| download | opensim-SC-86493d75fa6457f45942950f22ffcea391702c6a.zip opensim-SC-86493d75fa6457f45942950f22ffcea391702c6a.tar.gz opensim-SC-86493d75fa6457f45942950f22ffcea391702c6a.tar.bz2 opensim-SC-86493d75fa6457f45942950f22ffcea391702c6a.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region')
| -rwxr-xr-x | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 870957b..65ce61d 100755 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -78,7 +78,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 78 | /// A parameter to allow us to notify the log if at least one script has a compilation that is not compatible | 78 | /// A parameter to allow us to notify the log if at least one script has a compilation that is not compatible |
| 79 | /// with ScriptStopStrategy. | 79 | /// with ScriptStopStrategy. |
| 80 | /// </summary> | 80 | /// </summary> |
| 81 | public bool HaveNotifiedLogOfScriptStopMistmatch { get; private set; } | 81 | public bool HaveNotifiedLogOfScriptStopMismatch { get; private set; } |
| 82 | 82 | ||
| 83 | private SmartThreadPool m_ThreadPool; | 83 | private SmartThreadPool m_ThreadPool; |
| 84 | private int m_MaxScriptQueue; | 84 | private int m_MaxScriptQueue; |
| @@ -1480,7 +1480,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1480 | } | 1480 | } |
| 1481 | } | 1481 | } |
| 1482 | 1482 | ||
| 1483 | if (m_coopTermination != coopTerminationForThisScript && !HaveNotifiedLogOfScriptStopMistmatch) | 1483 | if (m_coopTermination != coopTerminationForThisScript && !HaveNotifiedLogOfScriptStopMismatch) |
| 1484 | { | 1484 | { |
| 1485 | // Notify the log that there is at least one script compile that doesn't match the | 1485 | // Notify the log that there is at least one script compile that doesn't match the |
| 1486 | // ScriptStopStrategy. Operator has to manually delete old DLLs - we can't do this on Windows | 1486 | // ScriptStopStrategy. Operator has to manually delete old DLLs - we can't do this on Windows |
| @@ -1490,7 +1490,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1490 | + "\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).", | 1490 | + "\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).", |
| 1491 | World.Name, coopTerminationForThisScript ? "co-op" : "abort", m_coopTermination ? "co-op" : "abort"); | 1491 | World.Name, coopTerminationForThisScript ? "co-op" : "abort", m_coopTermination ? "co-op" : "abort"); |
| 1492 | 1492 | ||
| 1493 | HaveNotifiedLogOfScriptStopMistmatch = true; | 1493 | HaveNotifiedLogOfScriptStopMismatch = true; |
| 1494 | } | 1494 | } |
| 1495 | 1495 | ||
| 1496 | instance = new ScriptInstance(this, part, | 1496 | instance = new ScriptInstance(this, part, |