diff options
| author | John Hurliman | 2010-09-03 13:36:59 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-03 13:36:59 -0700 |
| commit | aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34 (patch) | |
| tree | 30af81e23062b91bd333af5484443ad703f118e5 /OpenSim/Services/Connectors/Simulation | |
| parent | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to... (diff) | |
| parent | minor: remove mono compiler warnings (diff) | |
| download | opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.zip opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.tar.gz opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.tar.bz2 opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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 df818f5..a5f748f 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 | { |