aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/ServerMain.cs23
1 files changed, 21 insertions, 2 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 575d560..be12f8a 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -65,10 +65,29 @@ namespace OpenSim.Server
65 } 65 }
66 66
67 string connList = serverConfig.GetString("ServiceConnectors", String.Empty); 67 string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
68 string[] conns = connList.Split(new char[] {',', ' '});
69 68
70 registryLocation = serverConfig.GetString("RegistryLocation","."); 69 registryLocation = serverConfig.GetString("RegistryLocation",".");
71 70
71 IConfig servicesConfig = m_Server.Config.Configs["ServiceList"];
72 if (servicesConfig != null)
73 {
74 List<string> servicesList = new List<string>();
75 if (connList != String.Empty)
76 servicesList.Add(connList);
77
78 foreach (string k in servicesConfig.GetKeys())
79 {
80 string v = servicesConfig.GetString(k);
81 if (v != String.Empty)
82 servicesList.Add(v);
83 }
84
85 connList = String.Join(",", servicesList.ToArray());
86 }
87
88 string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'});
89>>>>>>> master
90
72// int i = 0; 91// int i = 0;
73 foreach (string c in conns) 92 foreach (string c in conns)
74 { 93 {
@@ -140,4 +159,4 @@ namespace OpenSim.Server
140 return 0; 159 return 0;
141 } 160 }
142 } 161 }
143} \ No newline at end of file 162}