diff options
| author | Diva Canto | 2015-10-14 15:26:26 -0700 |
|---|---|---|
| committer | Diva Canto | 2015-10-14 15:26:26 -0700 |
| commit | 073bdda4b899c93171b76ae5957c445bec62635c (patch) | |
| tree | 50609f233ad8aa56604e7cdd0d3eee3e8893134b | |
| parent | Also restoring proper function for Simian external GetTexture functionality. (diff) | |
| download | opensim-SC-073bdda4b899c93171b76ae5957c445bec62635c.zip opensim-SC-073bdda4b899c93171b76ae5957c445bec62635c.tar.gz opensim-SC-073bdda4b899c93171b76ae5957c445bec62635c.tar.bz2 opensim-SC-073bdda4b899c93171b76ae5957c445bec62635c.tar.xz | |
Restored authentication in AssetServicesConnector.
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index ea506c8..622780a 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
| @@ -327,7 +327,7 @@ namespace OpenSim.Services.Connectors | |||
| 327 | bool success = false; | 327 | bool success = false; |
| 328 | try | 328 | try |
| 329 | { | 329 | { |
| 330 | AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30000); | 330 | AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30000, m_Auth); |
| 331 | if (a != null) | 331 | if (a != null) |
| 332 | { | 332 | { |
| 333 | if (m_Cache != null) | 333 | if (m_Cache != null) |
| @@ -486,7 +486,7 @@ namespace OpenSim.Services.Connectors | |||
| 486 | try | 486 | try |
| 487 | { | 487 | { |
| 488 | newID = SynchronousRestObjectRequester. | 488 | newID = SynchronousRestObjectRequester. |
| 489 | MakeRequest<AssetBase, string>("POST", uri, asset, 100000); | 489 | MakeRequest<AssetBase, string>("POST", uri, asset, 100000, m_Auth); |
| 490 | if (newID == null || newID == "") | 490 | if (newID == null || newID == "") |
| 491 | { | 491 | { |
| 492 | newID = UUID.Zero.ToString(); | 492 | newID = UUID.Zero.ToString(); |