Merge branch 'avination' into careminster

2026-08-06 17:32:42 +08:00 · 2012-06-07 23:34:22 +01:00
parent e8cd9fbbb7 4942314435
commit 69dd5b855a
67 changed files with 467 additions and 122 deletions
--- a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
@@ -35,5 +35,6 @@ namespace OpenSim.Region.Framework.Interfaces
        TimeSpan TimeUntilRestart { get; }
        void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice);
        void AbortRestart(string message);
+        void DelayRestart(int seconds, string message);
    }
 }