aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie2010-05-28 21:56:42 +0100
committerMelanie2010-05-28 21:56:42 +0100
commit542e6b8af4c9b8aa2ba753dbaed5032fb5293024 (patch)
tree4acfe25e2388f35da48f7eaf3b312d85f149625f /OpenSim/Server
parentMerge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/car... (diff)
parentget TestSaveIarV0_1() uncommented but not running as a test yet since I didn'... (diff)
downloadopensim-SC_OLD-542e6b8af4c9b8aa2ba753dbaed5032fb5293024.zip
opensim-SC_OLD-542e6b8af4c9b8aa2ba753dbaed5032fb5293024.tar.gz
opensim-SC_OLD-542e6b8af4c9b8aa2ba753dbaed5032fb5293024.tar.bz2
opensim-SC_OLD-542e6b8af4c9b8aa2ba753dbaed5032fb5293024.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/ServerMain.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index d3e65a4..9503c4c 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Server
61 string connList = serverConfig.GetString("ServiceConnectors", String.Empty); 61 string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
62 string[] conns = connList.Split(new char[] {',', ' '}); 62 string[] conns = connList.Split(new char[] {',', ' '});
63 63
64 int i = 0; 64// int i = 0;
65 foreach (string c in conns) 65 foreach (string c in conns)
66 { 66 {
67 if (c == String.Empty) 67 if (c == String.Empty)