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

* refactor: Remove now redundant inventory server url being passed to GetInventorySkeleton

0.6.0-stable
Justin Clarke Casey 2008-07-24 17:19:33 +00:00
parent 918c0a4826
commit cdd3537706
3 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ namespace OpenSim.Framework.Communications
/// <param name="userID"></param> /// <param name="userID"></param>
/// <returns></returns> /// <returns></returns>
/// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception> /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception>
protected abstract InventoryData GetInventorySkeleton(LLUUID userID, string inventoryServerUrl); protected abstract InventoryData GetInventorySkeleton(LLUUID userID);
/// <summary> /// <summary>
/// Called when we receive the client's initial XMLRPC login_to_simulator request message /// Called when we receive the client's initial XMLRPC login_to_simulator request message
@ -230,12 +230,7 @@ namespace OpenSim.Framework.Communications
try try
{ {
string inventoryServerUrl = ""; inventData = GetInventorySkeleton(agentID);
//if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
//{
// inventoryServerUrl = userProfile.UserInventoryURI;
//}
inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
} }
catch (Exception e) catch (Exception e)
{ {
@ -390,15 +385,7 @@ namespace OpenSim.Framework.Communications
{ {
LLUUID agentID = userProfile.ID; 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; ArrayList AgentInventoryArray = inventData.InventoryArray;
Hashtable InventoryRootHash = new Hashtable(); Hashtable InventoryRootHash = new Hashtable();
@ -817,4 +804,4 @@ namespace OpenSim.Framework.Communications
} }
} }
} }
} }

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

@ -402,17 +402,12 @@ namespace OpenSim.Grid.UserServer
else else
{ {
response.CreateDeadRegionResponse(); response.CreateDeadRegionResponse();
} }
} }
else else
{ {
response.CreateDeadRegionResponse(); response.CreateDeadRegionResponse();
}
}
} }
catch (Exception e) catch (Exception e)
@ -424,7 +419,7 @@ namespace OpenSim.Grid.UserServer
} }
// See LoginService // See LoginService
protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) protected override InventoryData GetInventorySkeleton(LLUUID userID)
{ {
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}",

2
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@ -258,7 +258,7 @@ namespace OpenSim.Region.Communications.Local
} }
// See LoginService // See LoginService
protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) protected override InventoryData GetInventorySkeleton(LLUUID userID)
{ {
List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID); List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);