aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-01-17 00:05:13 +0000
committerJustin Clark-Casey (justincc)2015-01-17 00:05:13 +0000
commit29958681762eaa4cac57f73c78bab25d3ad1b239 (patch)
tree99ea9800171478a47c19ddb7369530186bc2c5f1
parentminor: remove old commented out objectRemoved bool in XEngine.OnRemoveScript() (diff)
downloadopensim-SC_OLD-29958681762eaa4cac57f73c78bab25d3ad1b239.zip
opensim-SC_OLD-29958681762eaa4cac57f73c78bab25d3ad1b239.tar.gz
opensim-SC_OLD-29958681762eaa4cac57f73c78bab25d3ad1b239.tar.bz2
opensim-SC_OLD-29958681762eaa4cac57f73c78bab25d3ad1b239.tar.xz
Make XEngine.SaveAllState() actually do this instead of script maintenance
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index a04a554..c8029d7 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -867,6 +867,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
867 867
868 public void SaveAllState() 868 public void SaveAllState()
869 { 869 {
870 DoBackup(new object[] { 0 });
871 }
872
873 public object DoMaintenance(object p)
874 {
875 object[] parms = (object[])p;
876 int sleepTime = (int)parms[0];
877
870 foreach (IScriptInstance inst in m_Scripts.Values) 878 foreach (IScriptInstance inst in m_Scripts.Values)
871 { 879 {
872 if (inst.EventTime() > m_EventLimit) 880 if (inst.EventTime() > m_EventLimit)
@@ -876,14 +884,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
876 inst.Start(); 884 inst.Start();
877 } 885 }
878 } 886 }
879 }
880
881 public object DoMaintenance(object p)
882 {
883 object[] parms = (object[])p;
884 int sleepTime = (int)parms[0];
885
886 SaveAllState();
887 887
888 System.Threading.Thread.Sleep(sleepTime); 888 System.Threading.Thread.Sleep(sleepTime);
889 889