From 90a39379f0976a00582e2096da4498395d71c109 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 8 Oct 2012 17:36:40 +0100
Subject: Allow other whitespace characters than spaces in Robust connection
 string

---
 OpenSim/Server/ServerMain.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 21fb678..365a79a 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Server
             }
 
             string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
-            string[] conns = connList.Split(new char[] {',', ' '});
+            string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'});
 
 //            int i = 0;
             foreach (string c in conns)
@@ -130,4 +130,4 @@ namespace OpenSim.Server
             return 0;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1


From ff92330523a3375b88dca017ed56d52e0859b561 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 8 Oct 2012 17:57:22 +0100
Subject: Add a ServiceList section to Robust .ini to get rid of the long
 string

---
 OpenSim/Server/ServerMain.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'OpenSim/Server')

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
             }
 
             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 = servicesConfig.Join(",");
+            }
+
             string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'});
 
 //            int i = 0;
-- 
cgit v1.1


From f65218f8265e0dfb03f6a779d0190af36c866244 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 8 Oct 2012 19:02:21 +0100
Subject: Fix build break

---
 OpenSim/Server/ServerMain.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 552e3a2..45c13fb 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Server
                         servicesList.Add(v);
                 }
 
-                connList = servicesConfig.Join(",");
+                connList = String.Join(",", servicesList.ToArray());
             }
 
             string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'});
-- 
cgit v1.1