aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2008-06-29 10:27:22 +0000
committerMW2008-06-29 10:27:22 +0000
commit68bec3f69feb24a50b073e05d099f5c03d26a437 (patch)
treeb4ec0c851139f4e6b40a11286008d8a9596d8d89
parent* Syncs the current revision XML Schema(xsd) to the XML Schema of revision 5251. (diff)
downloadopensim-SC_OLD-68bec3f69feb24a50b073e05d099f5c03d26a437.zip
opensim-SC_OLD-68bec3f69feb24a50b073e05d099f5c03d26a437.tar.gz
opensim-SC_OLD-68bec3f69feb24a50b073e05d099f5c03d26a437.tar.bz2
opensim-SC_OLD-68bec3f69feb24a50b073e05d099f5c03d26a437.tar.xz
couple of small fixes to try to fix support for multiple inventory servers in the loginservice
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs16
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs8
2 files changed, 18 insertions, 6 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();
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
422 protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) 422 protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
423 { 423 {
424 string invUrl = m_config.InventoryUrl; 424 string invUrl = m_config.InventoryUrl;
425 //if (serverUrl != String.Empty) 425 if (!String.IsNullOrEmpty(serverUrl))
426 //{ 426 {
427 // invUrl = serverUrl+"/"; 427 invUrl = serverUrl+"/";
428 //} 428 }
429 429
430 m_log.DebugFormat( 430 m_log.DebugFormat(
431 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", 431 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",