aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rwxr-xr-xOpenSim/Region/ScriptEngine/XEngine/XEngine.cs6
-rw-r--r--bin/config-include/osslEnable.ini4
2 files changed, 5 insertions, 5 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,
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 5987952..aa7c90b 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -217,10 +217,10 @@
217 Allow_osTeleportAgent = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 217 Allow_osTeleportAgent = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
218 Allow_osTeleportObject = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 218 Allow_osTeleportObject = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
219 219
220; funtions ThreatLevel Severe with additional internal restrictions 220 ; ThreatLevel Severe with additional internal restrictions
221 Allow_osGetAgentIP = true ; always restricted to Administrators (true or false to disable) 221 Allow_osGetAgentIP = true ; always restricted to Administrators (true or false to disable)
222 222
223; available funtions out of Threat level control (for reference only) 223; available functions out of Threat level control (for reference only)
224; Allow_osClearInertia = true 224; Allow_osClearInertia = true
225; Allow_osCheckODE = true 225; Allow_osCheckODE = true
226; Allow_osCollisionSound = true 226; Allow_osCollisionSound = true