diff options
author | MW | 2008-06-28 17:52:06 +0000 |
---|---|---|
committer | MW | 2008-06-28 17:52:06 +0000 |
commit | 5cfc468d959f1fcfa1fa8121154a70c6430df083 (patch) | |
tree | 3af37f23260eb3d7e7e6d15284cf9c463ead27e2 /OpenSim/Framework/Communications/LoginService.cs | |
parent | Manti#1624. Thank you, Melanie for a patch that: (diff) | |
download | opensim-SC-5cfc468d959f1fcfa1fa8121154a70c6430df083.zip opensim-SC-5cfc468d959f1fcfa1fa8121154a70c6430df083.tar.gz opensim-SC-5cfc468d959f1fcfa1fa8121154a70c6430df083.tar.bz2 opensim-SC-5cfc468d959f1fcfa1fa8121154a70c6430df083.tar.xz |
more work on the support for multiple inventory servers.
The Login service should now read/create new inventory on the inventory server that is set in a users profile.
Also added "Add-InventoryHost" console command to add a support for a new server to a region.
So it would be good if someone could test this. Set up the grid as normal, but then also run extra inventory server on a different computer (well actually it just has to be on a different network hostname, so one using "http://localhost:8004" and one using "http://127.0.0.1:8005" should work) then you need to manually edit the user profile database to set the new servers url in a user's "userInventoryURI" field.
Then on a region server, use the Add-InventoryHost to add the new server url (always include the full url, including http, but don't add a final /)
Login with that account and see if the inventory works.
Of course these needs to be made more user friendly.
Diffstat (limited to 'OpenSim/Framework/Communications/LoginService.cs')
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 08b071f..8fcb4f5 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Framework.Communications | |||
94 | /// <param name="userID"></param> | 94 | /// <param name="userID"></param> |
95 | /// <returns></returns> | 95 | /// <returns></returns> |
96 | /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception> | 96 | /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception> |
97 | protected abstract InventoryData GetInventorySkeleton(LLUUID userID); | 97 | protected abstract InventoryData GetInventorySkeleton(LLUUID userID, string inventoryServerUrl); |
98 | 98 | ||
99 | /// <summary> | 99 | /// <summary> |
100 | /// Called when we receive the client's initial XMLRPC login_to_simulator request message | 100 | /// Called when we receive the client's initial XMLRPC login_to_simulator request message |
@@ -230,7 +230,7 @@ namespace OpenSim.Framework.Communications | |||
230 | 230 | ||
231 | try | 231 | try |
232 | { | 232 | { |
233 | inventData = GetInventorySkeleton(agentID); | 233 | inventData = GetInventorySkeleton(agentID, userProfile.UserInventoryURI); |
234 | } | 234 | } |
235 | catch (Exception e) | 235 | catch (Exception e) |
236 | { | 236 | { |
@@ -386,7 +386,7 @@ namespace OpenSim.Framework.Communications | |||
386 | LLUUID agentID = userProfile.ID; | 386 | LLUUID agentID = userProfile.ID; |
387 | 387 | ||
388 | // Inventory Library Section | 388 | // Inventory Library Section |
389 | InventoryData inventData = GetInventorySkeleton(agentID); | 389 | InventoryData inventData = GetInventorySkeleton(agentID, userProfile.UserInventoryURI); |
390 | ArrayList AgentInventoryArray = inventData.InventoryArray; | 390 | ArrayList AgentInventoryArray = inventData.InventoryArray; |
391 | 391 | ||
392 | Hashtable InventoryRootHash = new Hashtable(); | 392 | Hashtable InventoryRootHash = new Hashtable(); |