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/Region | |
parent | Manti#1624. Thank you, Melanie for a patch that: (diff) | |
download | opensim-SC_OLD-5cfc468d959f1fcfa1fa8121154a70c6430df083.zip opensim-SC_OLD-5cfc468d959f1fcfa1fa8121154a70c6430df083.tar.gz opensim-SC_OLD-5cfc468d959f1fcfa1fa8121154a70c6430df083.tar.bz2 opensim-SC_OLD-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/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalLoginService.cs | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 8b42e2e..60e00a2 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -602,6 +602,13 @@ namespace OpenSim | |||
602 | } | 602 | } |
603 | 603 | ||
604 | break; | 604 | break; |
605 | |||
606 | case "Add-InventoryHost": | ||
607 | if (cmdparams.Length > 0) | ||
608 | { | ||
609 | m_commsManager.AddInventoryService(cmdparams[0]); | ||
610 | } | ||
611 | break; | ||
605 | default: | 612 | default: |
606 | string[] tmpPluginArgs = new string[cmdparams.Length + 1]; | 613 | string[] tmpPluginArgs = new string[cmdparams.Length + 1]; |
607 | cmdparams.CopyTo(tmpPluginArgs, 1); | 614 | cmdparams.CopyTo(tmpPluginArgs, 1); |
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 5f4558d..30a639a 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -258,7 +258,7 @@ namespace OpenSim.Region.Communications.Local | |||
258 | } | 258 | } |
259 | 259 | ||
260 | // See LoginService | 260 | // See LoginService |
261 | protected override InventoryData GetInventorySkeleton(LLUUID userID) | 261 | protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) |
262 | { | 262 | { |
263 | List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID); | 263 | List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID); |
264 | 264 | ||