aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs16
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
230 230
231 try 231 try
232 { 232 {
233 inventData = GetInventorySkeleton(agentID, ""); 233 string inventoryServerUrl = "";
234 if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
235 {
236 inventoryServerUrl = userProfile.UserInventoryURI;
237 }
238 inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
234 } 239 }
235 catch (Exception e) 240 catch (Exception e)
236 { 241 {
@@ -386,7 +391,14 @@ namespace OpenSim.Framework.Communications
386 LLUUID agentID = userProfile.ID; 391 LLUUID agentID = userProfile.ID;
387 392
388 // Inventory Library Section 393 // Inventory Library Section
389 InventoryData inventData = GetInventorySkeleton(agentID, ""); 394
395 string inventoryServerUrl = "";
396 if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
397 {
398 inventoryServerUrl = userProfile.UserInventoryURI;
399 }
400
401 InventoryData inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
390 ArrayList AgentInventoryArray = inventData.InventoryArray; 402 ArrayList AgentInventoryArray = inventData.InventoryArray;
391 403
392 Hashtable InventoryRootHash = new Hashtable(); 404 Hashtable InventoryRootHash = new Hashtable();