ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into connector_plugin

Browse Source 
Conflicts:
	OpenSim/Server/ServerMain.cs
This commit is contained in:
BlueWall
2012-10-09 06:44:14 -04:00
parent 440726250c f65218f826
commit 252af020b0
31 changed files with 809 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Server/ServerMain.cs
View File

@@ -65,10 +65,29 @@ namespace OpenSim.Server
}
string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
string[] conns = connList.Split(new char[] {',', ' '});
registryLocation = serverConfig.GetString("RegistryLocation",".");
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'});
>>>>>>> master
// int i = 0;
foreach (string c in conns)
{
@@ -140,4 +159,4 @@ namespace OpenSim.Server
return 0;
}
}
}
}