Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

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
             }
 
             string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
-
-            IConfig servicesConfig = m_Server.Config.Configs["ServiceList"];
-            if (servicesConfig != null)
-            {
-                List<string> servicesList = new List<string>();
-                if (connList != String.Empty)
-                    servicesList.Add(connList);
-
-                foreach (string k in servicesConfig.GetKeys())
-                {
-                    string v = servicesConfig.GetString(k);
-                    if (v != String.Empty)
-                        servicesList.Add(v);
-                }
-
-                connList = String.Join(",", servicesList.ToArray());
-            }
-
-            string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'});
+            string[] conns = connList.Split(new char[] {',', ' '});
 
 //            int i = 0;
             foreach (string c in conns)
@@ -148,4 +130,4 @@ namespace OpenSim.Server
             return 0;
         }
     }
-}
+}
\ No newline at end of file