aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs3
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs11
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs7
3 files changed, 19 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index fb5b17b..2065006 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -44,7 +44,8 @@ namespace OpenSim.Region.Communications.Local
44 IGridServices gridService, bool dumpAssetsToFile) 44 IGridServices gridService, bool dumpAssetsToFile)
45 : base(serversInfo, httpServer, assetCache, dumpAssetsToFile) 45 : base(serversInfo, httpServer, assetCache, dumpAssetsToFile)
46 { 46 {
47 m_inventoryService = inventoryService; 47 AddInventoryService( inventoryService);
48 m_defaultInventoryHost = inventoryService.Host;
48 m_userService = userService; 49 m_userService = userService;
49 m_gridService = gridService; 50 m_gridService = gridService;
50 m_interRegion = interRegionService; 51 m_interRegion = interRegionService;
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index d622b7e..b85654d 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -41,8 +41,17 @@ namespace OpenSim.Region.Communications.OGS1
41 m_gridService = gridInterComms; 41 m_gridService = gridInterComms;
42 m_interRegion = gridInterComms; 42 m_interRegion = gridInterComms;
43 43
44 m_inventoryService = new OGS1InventoryService(serversInfo.InventoryURL); 44 OGS1InventoryService invService = new OGS1InventoryService(serversInfo.InventoryURL);
45 AddInventoryService(invService);
46 m_defaultInventoryHost = invService.Host;
47
45 m_userService = new OGS1UserServices(this); 48 m_userService = new OGS1UserServices(this);
46 } 49 }
50
51 public override void AddInventoryService(string hostUrl)
52 {
53 OGS1InventoryService invService = new OGS1InventoryService(hostUrl);
54 AddInventoryService(invService);
55 }
47 } 56 }
48} 57}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index dfc741a..4e4bfe8 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -45,16 +45,23 @@ namespace OpenSim.Region.Communications.OGS1
45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 private string _inventoryServerUrl; 47 private string _inventoryServerUrl;
48 private Uri m_Uri;
48 private Dictionary<LLUUID, InventoryReceiptCallback> m_RequestingInventory 49 private Dictionary<LLUUID, InventoryReceiptCallback> m_RequestingInventory
49 = new Dictionary<LLUUID, InventoryReceiptCallback>(); 50 = new Dictionary<LLUUID, InventoryReceiptCallback>();
50 51
51 public OGS1InventoryService(string inventoryServerUrl) 52 public OGS1InventoryService(string inventoryServerUrl)
52 { 53 {
53 _inventoryServerUrl = inventoryServerUrl; 54 _inventoryServerUrl = inventoryServerUrl;
55 m_Uri = new Uri(_inventoryServerUrl);
54 } 56 }
55 57
56 #region IInventoryServices Members 58 #region IInventoryServices Members
57 59
60 public string Host
61 {
62 get { return m_Uri.Host; }
63 }
64
58 /// <summary> 65 /// <summary>
59 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 66 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
60 /// </summary> 67 /// </summary>