diff options
author | Diva Canto | 2011-05-26 15:52:34 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-26 15:52:34 -0700 |
commit | b17afe43c4f72bace2bd991d4cac83837acb9a67 (patch) | |
tree | e23aae27316b018065890b77028dfa4706981d5e /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | HG IM in grid mode working fairly well. Unknown target user references looked... (diff) | |
parent | improve help information for "appearance show" (diff) | |
download | opensim-SC_OLD-b17afe43c4f72bace2bd991d4cac83837acb9a67.zip opensim-SC_OLD-b17afe43c4f72bace2bd991d4cac83837acb9a67.tar.gz opensim-SC_OLD-b17afe43c4f72bace2bd991d4cac83837acb9a67.tar.bz2 opensim-SC_OLD-b17afe43c4f72bace2bd991d4cac83837acb9a67.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 97ab411..d253c6a 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -393,11 +393,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
393 | return 0; | 393 | return 0; |
394 | } | 394 | } |
395 | 395 | ||
396 | public object DoMaintenance(object p) | 396 | public void SaveAllState() |
397 | { | 397 | { |
398 | object[] parms = (object[])p; | ||
399 | int sleepTime = (int)parms[0]; | ||
400 | |||
401 | foreach (IScriptInstance inst in m_Scripts.Values) | 398 | foreach (IScriptInstance inst in m_Scripts.Values) |
402 | { | 399 | { |
403 | if (inst.EventTime() > m_EventLimit) | 400 | if (inst.EventTime() > m_EventLimit) |
@@ -407,6 +404,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
407 | inst.Start(); | 404 | inst.Start(); |
408 | } | 405 | } |
409 | } | 406 | } |
407 | } | ||
408 | |||
409 | public object DoMaintenance(object p) | ||
410 | { | ||
411 | object[] parms = (object[])p; | ||
412 | int sleepTime = (int)parms[0]; | ||
413 | |||
414 | SaveAllState(); | ||
410 | 415 | ||
411 | System.Threading.Thread.Sleep(sleepTime); | 416 | System.Threading.Thread.Sleep(sleepTime); |
412 | 417 | ||