couple of small fixes to try to fix support for multiple inventory servers in the loginservice

1 files changed, 14 insertions, 2 deletions

diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 9005cff..3e1a885 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -230,7 +230,12 @@ namespace OpenSim.Framework.Communications
 
                         try
                         {
-                            inventData = GetInventorySkeleton(agentID, "");
+                            string inventoryServerUrl = "";
+                            if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
+                            {
+                                inventoryServerUrl = userProfile.UserInventoryURI;
+                            }
+                            inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
                         }
                         catch (Exception e)
                         {
@@ -386,7 +391,14 @@ namespace OpenSim.Framework.Communications
                         LLUUID agentID = userProfile.ID;
 
                         // Inventory Library Section
-                        InventoryData inventData = GetInventorySkeleton(agentID, "");
+
+                        string inventoryServerUrl = "";
+                        if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
+                        {
+                            inventoryServerUrl = userProfile.UserInventoryURI;
+                        }
+
+                        InventoryData inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
                         ArrayList AgentInventoryArray = inventData.InventoryArray;
 
                         Hashtable InventoryRootHash = new Hashtable();