diff options
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/ServerMain.cs | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index 45c13fb..21fb678 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
| @@ -60,25 +60,7 @@ namespace OpenSim.Server | |||
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | string connList = serverConfig.GetString("ServiceConnectors", String.Empty); | 62 | string connList = serverConfig.GetString("ServiceConnectors", String.Empty); |
| 63 | 63 | string[] conns = connList.Split(new char[] {',', ' '}); | |
| 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 = String.Join(",", servicesList.ToArray()); | ||
| 79 | } | ||
| 80 | |||
| 81 | string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'}); | ||
| 82 | 64 | ||
| 83 | // int i = 0; | 65 | // int i = 0; |
| 84 | foreach (string c in conns) | 66 | foreach (string c in conns) |
| @@ -148,4 +130,4 @@ namespace OpenSim.Server | |||
| 148 | return 0; | 130 | return 0; |
| 149 | } | 131 | } |
| 150 | } | 132 | } |
| 151 | } | 133 | } \ No newline at end of file |