OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.6.0-stable
MW 2008-06-29 10:27:22 +00:00
parent 7f847166a9
commit 68bec3f69f
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Framework/Communications/LoginService.cs
View File

@ -230,7 +230,12 @@ namespace OpenSim.Framework.Communications
try try
{ {
inventData = GetInventorySkeleton(agentID, ""); string inventoryServerUrl = "";
if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
{
inventoryServerUrl = userProfile.UserInventoryURI;
}
inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
} }
catch (Exception e) catch (Exception e)
{ {
@ -386,7 +391,14 @@ namespace OpenSim.Framework.Communications
LLUUID agentID = userProfile.ID; LLUUID agentID = userProfile.ID;
// Inventory Library Section // 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; ArrayList AgentInventoryArray = inventData.InventoryArray;
Hashtable InventoryRootHash = new Hashtable(); Hashtable InventoryRootHash = new Hashtable();

8
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@ -422,10 +422,10 @@ namespace OpenSim.Grid.UserServer
protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
{ {
string invUrl = m_config.InventoryUrl; string invUrl = m_config.InventoryUrl;
//if (serverUrl != String.Empty) if (!String.IsNullOrEmpty(serverUrl))
//{ {
// invUrl = serverUrl+"/"; invUrl = serverUrl+"/";
//} }
m_log.DebugFormat( m_log.DebugFormat(
"[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",