diff options
author | Diva Canto | 2014-05-23 16:19:43 -0700 |
---|---|---|
committer | Diva Canto | 2014-05-23 16:19:43 -0700 |
commit | 20f20895cf1444071d5edc42e11a1fb94b1b1079 (patch) | |
tree | 0c7547590a89eec47886e0a8646f86ebbf449e63 /OpenSim/Services/Connectors/Inventory | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-20f20895cf1444071d5edc42e11a1fb94b1b1079.zip opensim-SC_OLD-20f20895cf1444071d5edc42e11a1fb94b1b1079.tar.gz opensim-SC_OLD-20f20895cf1444071d5edc42e11a1fb94b1b1079.tar.bz2 opensim-SC_OLD-20f20895cf1444071d5edc42e11a1fb94b1b1079.tar.xz |
Adds optional HTTP Basic Authentication to Robust service connectors.
Diffstat (limited to 'OpenSim/Services/Connectors/Inventory')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs index 85d105e..f86d2f1 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | |||
@@ -40,7 +40,7 @@ using OpenMetaverse; | |||
40 | 40 | ||
41 | namespace OpenSim.Services.Connectors | 41 | namespace OpenSim.Services.Connectors |
42 | { | 42 | { |
43 | public class XInventoryServicesConnector : IInventoryService | 43 | public class XInventoryServicesConnector : BaseServiceConnector, IInventoryService |
44 | { | 44 | { |
45 | private static readonly ILog m_log = | 45 | private static readonly ILog m_log = |
46 | LogManager.GetLogger( | 46 | LogManager.GetLogger( |
@@ -60,6 +60,7 @@ namespace OpenSim.Services.Connectors | |||
60 | } | 60 | } |
61 | 61 | ||
62 | public XInventoryServicesConnector(IConfigSource source) | 62 | public XInventoryServicesConnector(IConfigSource source) |
63 | : base(source, "InventoryService") | ||
63 | { | 64 | { |
64 | Initialise(source); | 65 | Initialise(source); |
65 | } | 66 | } |
@@ -505,7 +506,7 @@ namespace OpenSim.Services.Connectors | |||
505 | lock (m_Lock) | 506 | lock (m_Lock) |
506 | reply = SynchronousRestFormsRequester.MakeRequest("POST", | 507 | reply = SynchronousRestFormsRequester.MakeRequest("POST", |
507 | m_ServerURI + "/xinventory", | 508 | m_ServerURI + "/xinventory", |
508 | ServerUtils.BuildQueryString(sendData)); | 509 | ServerUtils.BuildQueryString(sendData), m_Auth); |
509 | 510 | ||
510 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( | 511 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( |
511 | reply); | 512 | reply); |