diff options
| author | Melanie | 2012-06-14 00:10:52 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-14 00:10:52 +0100 |
| commit | d893e54f4b4d3b4a8f6bfa3c8744487527a194a0 (patch) | |
| tree | 1601e04322dba9c6c4ae2412c92821f93aca5c7b /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplica... (diff) | |
| download | opensim-SC_OLD-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.zip opensim-SC_OLD-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.gz opensim-SC_OLD-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.bz2 opensim-SC_OLD-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 58e9b10..ac8d568 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -33,6 +33,10 @@ | |||
| 33 | ; Console commands run every 20 minutes | 33 | ; Console commands run every 20 minutes |
| 34 | ; timer_Script = "filename" | 34 | ; timer_Script = "filename" |
| 35 | 35 | ||
| 36 | ; timer_Script time interval (default 20 min) | ||
| 37 | ; The time is 60 per minute | ||
| 38 | ; timer_Interval = 1200 | ||
| 39 | |||
| 36 | ; ## | 40 | ; ## |
| 37 | ; ## SYSTEM | 41 | ; ## SYSTEM |
| 38 | ; ## | 42 | ; ## |