diff options
author | MW | 2008-06-28 15:13:17 +0000 |
---|---|---|
committer | MW | 2008-06-28 15:13:17 +0000 |
commit | 86defd0a69d53df6d352b7d4b9a5b9d6621c19e8 (patch) | |
tree | 111e3144f54437d74650704d0a299451ed1a0e7a /OpenSim/Region | |
parent | Remove one warning. We are now down to 16 warnings in (diff) | |
download | opensim-SC_OLD-86defd0a69d53df6d352b7d4b9a5b9d6621c19e8.zip opensim-SC_OLD-86defd0a69d53df6d352b7d4b9a5b9d6621c19e8.tar.gz opensim-SC_OLD-86defd0a69d53df6d352b7d4b9a5b9d6621c19e8.tar.bz2 opensim-SC_OLD-86defd0a69d53df6d352b7d4b9a5b9d6621c19e8.tar.xz |
plumbing for multiple inventory servers. Mostly done on the region server side.
TODO next is to make the login server read/write a users inventory from the correct server (the inventory url set in a userprofile)
On the region side, although not tested with multiple servers it should work if that inventory url was set, and the inventory servers urls have been added to the CommunicationsManager, using CommunicationsManager.AddInventoryService(string hostUrl)
Diffstat (limited to 'OpenSim/Region')
6 files changed, 22 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index aecf2df..06b4de7 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -173,7 +173,7 @@ namespace OpenSim | |||
173 | { | 173 | { |
174 | if (File.Exists("OpenSim.xml")) | 174 | if (File.Exists("OpenSim.xml")) |
175 | { | 175 | { |
176 | //chech for a xml config file | 176 | //check for a xml config file |
177 | Application.iniFilePath = "OpenSim.xml"; | 177 | Application.iniFilePath = "OpenSim.xml"; |
178 | m_config.Source = new XmlConfigSource(); | 178 | m_config.Source = new XmlConfigSource(); |
179 | m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath)); | 179 | m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath)); |
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> |
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index cdd138b..da93890 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -696,5 +696,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
696 | { | 696 | { |
697 | return m_commsProvider.GenerateAgentPickerRequestResponse(queryID, query); | 697 | return m_commsProvider.GenerateAgentPickerRequestResponse(queryID, query); |
698 | } | 698 | } |
699 | |||
699 | } | 700 | } |
700 | } | 701 | } |
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index 9c70a04..43b492a 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -66,6 +66,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
66 | appearance = CreateDefault(avatarId); | 66 | appearance = CreateDefault(avatarId); |
67 | m_log.InfoFormat("[APPEARANCE] appearance not found for {0}, creating default", avatarId.ToString()); | 67 | m_log.InfoFormat("[APPEARANCE] appearance not found for {0}, creating default", avatarId.ToString()); |
68 | return false; | 68 | return false; |
69 | |||
69 | } | 70 | } |
70 | 71 | ||
71 | private AvatarAppearance CreateDefault(LLUUID avatarId) | 72 | private AvatarAppearance CreateDefault(LLUUID avatarId) |