diff options
| author | Melanie | 2010-09-03 19:18:03 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-03 19:18:03 +0100 |
| commit | 5cbc4e2a5fdc844164b09a117f0a87d271e9af39 (patch) | |
| tree | e3a858c5dc2f1acd6ce26a32b81f3aea62a87abd /OpenSim/Services/Connectors/Simulation | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Last+2 tweak (diff) | |
| download | opensim-SC_OLD-5cbc4e2a5fdc844164b09a117f0a87d271e9af39.zip opensim-SC_OLD-5cbc4e2a5fdc844164b09a117f0a87d271e9af39.tar.gz opensim-SC_OLD-5cbc4e2a5fdc844164b09a117f0a87d271e9af39.tar.bz2 opensim-SC_OLD-5cbc4e2a5fdc844164b09a117f0a87d271e9af39.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 6d852f1..a8ed66d 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
| @@ -107,7 +107,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
| 107 | string uri = string.Empty; | 107 | string uri = string.Empty; |
| 108 | 108 | ||
| 109 | // HACK -- Simian grid make it work!!! | 109 | // HACK -- Simian grid make it work!!! |
| 110 | if (destination.ServerURI != string.Empty) | 110 | if (destination.ServerURI != null && destination.ServerURI != string.Empty && !destination.ServerURI.StartsWith("http:")) |
| 111 | uri = "http://" + destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; | 111 | uri = "http://" + destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; |
| 112 | else | 112 | else |
| 113 | { | 113 | { |