Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-05-28 21:56:42 +01:00
22 changed files with 1127 additions and 1058 deletions

View File

@@ -61,7 +61,7 @@ namespace OpenSim.Server
string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
string[] conns = connList.Split(new char[] {',', ' '});
int i = 0;
// int i = 0;
foreach (string c in conns)
{
if (c == String.Empty)