Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-09-03 19:18:03 +01:00
2 changed files with 3 additions and 3 deletions

View File

@@ -107,7 +107,7 @@ namespace OpenSim.Services.Connectors.Simulation
string uri = string.Empty;
// HACK -- Simian grid make it work!!!
if (destination.ServerURI != string.Empty)
if (destination.ServerURI != null && destination.ServerURI != string.Empty && !destination.ServerURI.StartsWith("http:"))
uri = "http://" + destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
else
{