diff options
| author | Justin Clark-Casey (justincc) | 2011-11-24 20:22:17 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-11-24 20:22:17 +0000 |
| commit | decabe11816069b71a982505f2078f2ae7f63654 (patch) | |
| tree | bdfe0a895ddcd3a84c6c9374fac16f4f101c7687 /OpenSim/Services | |
| parent | Add disabled CrossBehaviour to pCampBot, which is designed to cross test bots... (diff) | |
| parent | Append asset ID to URL for storage requests to allow caching proxies to work ... (diff) | |
| download | opensim-SC_OLD-decabe11816069b71a982505f2078f2ae7f63654.zip opensim-SC_OLD-decabe11816069b71a982505f2078f2ae7f63654.tar.gz opensim-SC_OLD-decabe11816069b71a982505f2078f2ae7f63654.tar.bz2 opensim-SC_OLD-decabe11816069b71a982505f2078f2ae7f63654.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index d8089ac..9573e21 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
| @@ -334,7 +334,9 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 334 | // Make the remote storage request | 334 | // Make the remote storage request |
| 335 | try | 335 | try |
| 336 | { | 336 | { |
| 337 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl); | 337 | // Simian does not require the asset ID to be in the URL because it's in the post data. |
| 338 | // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs | ||
| 339 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString()); | ||
| 338 | 340 | ||
| 339 | HttpWebResponse response = MultipartForm.Post(request, postParameters); | 341 | HttpWebResponse response = MultipartForm.Post(request, postParameters); |
| 340 | using (Stream responseStream = response.GetResponseStream()) | 342 | using (Stream responseStream = response.GetResponseStream()) |