Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2026-08-13 05:05:43 +08:00 · 2012-06-14 00:10:52 +01:00
parent 12621201ba 16ffc764bf
commit d893e54f4b
9 changed files with 60 additions and 24 deletions
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -33,6 +33,10 @@
    ; Console commands run every 20 minutes
    ; timer_Script = "filename"

+    ; timer_Script time interval (default 20 min)
+    ; The time is 60 per minute
+    ; timer_Interval = 1200
+
    ; ##
    ; ## SYSTEM
    ; ##