OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2017-09-04 18:39:42 +01:00
parent 34da125a4d e08b051ca6
commit 86493d75fa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -78,7 +78,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
/// A parameter to allow us to notify the log if at least one script has a compilation that is not compatible /// A parameter to allow us to notify the log if at least one script has a compilation that is not compatible
/// with ScriptStopStrategy. /// with ScriptStopStrategy.
/// </summary> /// </summary>
public bool HaveNotifiedLogOfScriptStopMistmatch { get; private set; } public bool HaveNotifiedLogOfScriptStopMismatch { get; private set; }
private SmartThreadPool m_ThreadPool; private SmartThreadPool m_ThreadPool;
private int m_MaxScriptQueue; private int m_MaxScriptQueue;
@ -1480,7 +1480,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
} }
} }
if (m_coopTermination != coopTerminationForThisScript && !HaveNotifiedLogOfScriptStopMistmatch) if (m_coopTermination != coopTerminationForThisScript && !HaveNotifiedLogOfScriptStopMismatch)
{ {
// Notify the log that there is at least one script compile that doesn't match the // Notify the log that there is at least one script compile that doesn't match the
// ScriptStopStrategy. Operator has to manually delete old DLLs - we can't do this on Windows // ScriptStopStrategy. Operator has to manually delete old DLLs - we can't do this on Windows
@ -1490,7 +1490,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
+ "\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).", + "\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 ? "co-op" : "abort"); World.Name, coopTerminationForThisScript ? "co-op" : "abort", m_coopTermination ? "co-op" : "abort");
HaveNotifiedLogOfScriptStopMistmatch = true; HaveNotifiedLogOfScriptStopMismatch = true;
} }
instance = new ScriptInstance(this, part, instance = new ScriptInstance(this, part,

4
bin/config-include/osslEnable.ini
View File

@ -217,10 +217,10 @@
Allow_osTeleportAgent = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osTeleportAgent = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
Allow_osTeleportObject = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osTeleportObject = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
; funtions ThreatLevel Severe with additional internal restrictions ; ThreatLevel Severe with additional internal restrictions
Allow_osGetAgentIP = true ; always restricted to Administrators (true or false to disable) Allow_osGetAgentIP = true ; always restricted to Administrators (true or false to disable)
; available funtions out of Threat level control (for reference only) ; available functions out of Threat level control (for reference only)
; Allow_osClearInertia = true ; Allow_osClearInertia = true
; Allow_osCheckODE = true ; Allow_osCheckODE = true
; Allow_osCollisionSound = true ; Allow_osCollisionSound = true