diff options
author | Melanie | 2011-12-24 02:21:35 +0000 |
---|---|---|
committer | Melanie | 2011-12-24 02:21:35 +0000 |
commit | c4e16b26bb417065cfadb1772379786560d33dda (patch) | |
tree | b3fb5ff89588474ba0a9aa75a0339097c605d7b9 /OpenSim/Services/Connectors | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-c4e16b26bb417065cfadb1772379786560d33dda.zip opensim-SC-c4e16b26bb417065cfadb1772379786560d33dda.tar.gz opensim-SC-c4e16b26bb417065cfadb1772379786560d33dda.tar.bz2 opensim-SC-c4e16b26bb417065cfadb1772379786560d33dda.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Connectors')
3 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs index 7cfd6e8..ff1dd5f 100644 --- a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Services.Connectors | |||
53 | 53 | ||
54 | public virtual string Helo() | 54 | public virtual string Helo() |
55 | { | 55 | { |
56 | HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI + "/helo"); | 56 | HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI + "/helo/"); |
57 | // Eventually we need to switch to HEAD | 57 | // Eventually we need to switch to HEAD |
58 | /* req.Method = "HEAD"; */ | 58 | /* req.Method = "HEAD"; */ |
59 | 59 | ||
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 9573e21..99523a1 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -86,6 +86,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
86 | 86 | ||
87 | public SimianAssetServiceConnector(string url) | 87 | public SimianAssetServiceConnector(string url) |
88 | { | 88 | { |
89 | if (!url.EndsWith("/") && !url.EndsWith("=")) | ||
90 | url = url + '/'; | ||
89 | m_serverUrl = url; | 91 | m_serverUrl = url; |
90 | } | 92 | } |
91 | 93 | ||
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 39df1f5..f828abb 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -92,7 +92,10 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
92 | 92 | ||
93 | public SimianInventoryServiceConnector(string url) | 93 | public SimianInventoryServiceConnector(string url) |
94 | { | 94 | { |
95 | if (!url.EndsWith("/") && !url.EndsWith("=")) | ||
96 | url = url + '/'; | ||
95 | m_serverUrl = url; | 97 | m_serverUrl = url; |
98 | |||
96 | } | 99 | } |
97 | 100 | ||
98 | public void Initialise(IConfigSource source) | 101 | public void Initialise(IConfigSource source) |