diff options
author | Melanie | 2012-10-08 17:57:22 +0100 |
---|---|---|
committer | Melanie | 2012-10-08 17:57:22 +0100 |
commit | ff92330523a3375b88dca017ed56d52e0859b561 (patch) | |
tree | 25d46d2abbe8d090a6a5e0518724cf26f1953447 /OpenSim/Server/ServerMain.cs | |
parent | Allow other whitespace characters than spaces in Robust connection string (diff) | |
download | opensim-SC_OLD-ff92330523a3375b88dca017ed56d52e0859b561.zip opensim-SC_OLD-ff92330523a3375b88dca017ed56d52e0859b561.tar.gz opensim-SC_OLD-ff92330523a3375b88dca017ed56d52e0859b561.tar.bz2 opensim-SC_OLD-ff92330523a3375b88dca017ed56d52e0859b561.tar.xz |
Add a ServiceList section to Robust .ini to get rid of the long string
Diffstat (limited to 'OpenSim/Server/ServerMain.cs')
-rw-r--r-- | OpenSim/Server/ServerMain.cs | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index 365a79a..552e3a2 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
@@ -60,6 +60,24 @@ namespace OpenSim.Server | |||
60 | } | 60 | } |
61 | 61 | ||
62 | string connList = serverConfig.GetString("ServiceConnectors", String.Empty); | 62 | string connList = serverConfig.GetString("ServiceConnectors", String.Empty); |
63 | |||
64 | IConfig servicesConfig = m_Server.Config.Configs["ServiceList"]; | ||
65 | if (servicesConfig != null) | ||
66 | { | ||
67 | List<string> servicesList = new List<string>(); | ||
68 | if (connList != String.Empty) | ||
69 | servicesList.Add(connList); | ||
70 | |||
71 | foreach (string k in servicesConfig.GetKeys()) | ||
72 | { | ||
73 | string v = servicesConfig.GetString(k); | ||
74 | if (v != String.Empty) | ||
75 | servicesList.Add(v); | ||
76 | } | ||
77 | |||
78 | connList = servicesConfig.Join(","); | ||
79 | } | ||
80 | |||
63 | string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'}); | 81 | string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'}); |
64 | 82 | ||
65 | // int i = 0; | 83 | // int i = 0; |