diff options
| author | Melanie | 2012-12-16 21:19:30 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-16 21:19:30 +0000 |
| commit | 0a876a305c32e52d7d0b437c8246119227fce51c (patch) | |
| tree | 59772311fcbaf528749b3b9661b252d99f0776ba /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make WebStatsModule properly handle scenes added or removed after initial sta... (diff) | |
| download | opensim-SC_OLD-0a876a305c32e52d7d0b437c8246119227fce51c.zip opensim-SC_OLD-0a876a305c32e52d7d0b437c8246119227fce51c.tar.gz opensim-SC_OLD-0a876a305c32e52d7d0b437c8246119227fce51c.tar.bz2 opensim-SC_OLD-0a876a305c32e52d7d0b437c8246119227fce51c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d83896e..9bfab4a 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1364,6 +1364,10 @@ | |||
| 1364 | ; If a script overruns it's event limit, kill the script? | 1364 | ; If a script overruns it's event limit, kill the script? |
| 1365 | KillTimedOutScripts = false | 1365 | KillTimedOutScripts = false |
| 1366 | 1366 | ||
| 1367 | ; Amount of time in milliseconds we will wait for an event to completely normally when a script stop is requested | ||
| 1368 | ; before aborting the thread (such as when an object containing scripts is taken into inventory). | ||
| 1369 | WaitForEventCompletionOnScriptStop = 1000; | ||
| 1370 | |||
| 1367 | ; Sets the multiplier for the scripting delays | 1371 | ; Sets the multiplier for the scripting delays |
| 1368 | ScriptDelayFactor = 1.0 | 1372 | ScriptDelayFactor = 1.0 |
| 1369 | 1373 | ||