summaryrefslogtreecommitdiff
path: root/conf-tmpl
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-07 09:01:22 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-07 09:01:22 +0000
commit058375e6a0ff8783c1f23111049f5d4b9c2d8834 (patch)
treeaa6df1015f29abfd0319a02e05a77f7ef6080583 /conf-tmpl
parent14e01888d06cfc94df20568d8e3c697fd3355117 (diff)
downloadhercules-058375e6a0ff8783c1f23111049f5d4b9c2d8834.tar.gz
hercules-058375e6a0ff8783c1f23111049f5d4b9c2d8834.tar.bz2
hercules-058375e6a0ff8783c1f23111049f5d4b9c2d8834.tar.xz
hercules-058375e6a0ff8783c1f23111049f5d4b9c2d8834.zip
Stall_time changes
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@930 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf-tmpl')
-rw-r--r--conf-tmpl/inter_athena.conf16
-rw-r--r--conf-tmpl/login_athena.conf2
2 files changed, 9 insertions, 9 deletions
diff --git a/conf-tmpl/inter_athena.conf b/conf-tmpl/inter_athena.conf
index 9d6040107..b73865f8f 100644
--- a/conf-tmpl/inter_athena.conf
+++ b/conf-tmpl/inter_athena.conf
@@ -23,12 +23,21 @@ castle_txt: save/castle.txt
// Options for both versions
+// Log Inter Connections, etc.?
+log_inter: 1
+
// Inter Log Filename
inter_log_filename: log/inter.log
// Level range for sharing within a party
party_share_level: 10
+// How long can a socket stall before closing the connection
+stall_time: 60
+
+
+
+// SQL version options only
// The lowest GM level on your server
lowest_gm_level: 1
@@ -36,10 +45,6 @@ lowest_gm_level: 1
// How often the GM accounts will be reloaded by the map-server in minutes
read_gm_interval: 10
-
-
-// SQL version options only
-
// Ideally under linux, you want to use localhost instead of 127.0.0.1.
//
// Under windows, you want to use 127.0.0.1. If you see a message like
@@ -130,7 +135,4 @@ mob_db_db: mob_db
//Use SQL item_db and mob_db for the map server
use_sql_db: no
-// Log Inter Connections, etc.?
-log_inter: 1
-
import: conf/import/inter_conf.txt
diff --git a/conf-tmpl/login_athena.conf b/conf-tmpl/login_athena.conf
index 4758f7dc0..5b4395b28 100644
--- a/conf-tmpl/login_athena.conf
+++ b/conf-tmpl/login_athena.conf
@@ -151,7 +151,5 @@ flush_on: 0
// How often to flush the buffer in Mugendai's GUI
flush_time: 60
-// How long can a socket stall before closing the connection
-stall_time: 60
import: conf/import/login_conf.txt