aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces
diff options
context:
space:
mode:
authorMelanie2012-06-07 23:34:22 +0100
committerMelanie2012-06-07 23:34:22 +0100
commit69dd5b855adb8178cc1057a645a2a6d433c2dc0f (patch)
tree392a996bd1aeab76743288fcfd7300a1a58faac1 /OpenSim/Region/Framework/Interfaces
parentMerge branch 'master' into careminster (diff)
parentImplement playing of the real collision sounds, change scaling for avatar (diff)
downloadopensim-SC_OLD-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.zip
opensim-SC_OLD-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.gz
opensim-SC_OLD-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.bz2
opensim-SC_OLD-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRestartModule.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
index c68550f..9b25beb 100644
--- a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
@@ -35,5 +35,6 @@ namespace OpenSim.Region.Framework.Interfaces
35 TimeSpan TimeUntilRestart { get; } 35 TimeSpan TimeUntilRestart { get; }
36 void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice); 36 void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice);
37 void AbortRestart(string message); 37 void AbortRestart(string message);
38 void DelayRestart(int seconds, string message);
38 } 39 }
39} 40}