From 68bec3f69feb24a50b073e05d099f5c03d26a437 Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 29 Jun 2008 10:27:22 +0000
Subject: couple of small fixes to try to fix support for multiple inventory
 servers in the loginservice

---
 OpenSim/Framework/Communications/LoginService.cs | 16 ++++++++++++++--
 OpenSim/Grid/UserServer/UserLoginService.cs      |  8 ++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'OpenSim')

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();
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 7c41b2e..9b2600f 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -422,10 +422,10 @@ namespace OpenSim.Grid.UserServer
         protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
         {
             string invUrl = m_config.InventoryUrl;
-            //if (serverUrl != String.Empty)
-            //{
-            //    invUrl = serverUrl+"/";
-            //}
+            if (!String.IsNullOrEmpty(serverUrl))
+            {
+                invUrl = serverUrl+"/";
+            }
             
             m_log.DebugFormat(
                  "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",
-- 
cgit v1.1