OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restored authentication in AssetServicesConnector.

avinationmerge
Diva Canto 2015-10-14 15:26:26 -07:00
parent 366e81b977
commit 073bdda4b8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

@ -327,7 +327,7 @@ namespace OpenSim.Services.Connectors
bool success = false; bool success = false;
try try
{ {
AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30000); AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30000, m_Auth);
if (a != null) if (a != null)
{ {
if (m_Cache != null) if (m_Cache != null)
@ -486,7 +486,7 @@ namespace OpenSim.Services.Connectors
try try
{ {
newID = SynchronousRestObjectRequester. newID = SynchronousRestObjectRequester.
MakeRequest<AssetBase, string>("POST", uri, asset, 100000); MakeRequest<AssetBase, string>("POST", uri, asset, 100000, m_Auth);
if (newID == null || newID == "") if (newID == null || newID == "")
{ {
newID = UUID.Zero.ToString(); newID = UUID.Zero.ToString();