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

* Refactor: Eliminate RequestUsersRoot() redundant method

0.6.0-stable
Justin Clarke Casey 2008-03-28 17:37:55 +00:00
parent c8f79eb9b4
commit 35dec2e53a
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@ -109,19 +109,10 @@ namespace OpenSim.Framework.Communications
return inventoryList; return inventoryList;
} }
// See IInventoryServices
public InventoryFolderBase RequestUsersRoot(LLUUID userID)
{
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
{
return plugin.Value.getUserRootFolder(userID);
}
return null;
}
// See IInventoryServices // See IInventoryServices
public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder) public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder)
{ {
// FIXME: Probably doesn't do what was originally intended - only ever queries the first plugin
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins) foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
{ {
plugin.Value.moveInventoryFolder(folder); plugin.Value.moveInventoryFolder(folder);
@ -137,7 +128,12 @@ namespace OpenSim.Framework.Communications
// See IInventoryServices // See IInventoryServices
public InventoryFolderBase RequestRootFolder(LLUUID userID) public InventoryFolderBase RequestRootFolder(LLUUID userID)
{ {
return RequestUsersRoot(userID); // FIXME: Probably doesn't do what was originally intended - only ever queries the first plugin
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
{
return plugin.Value.getUserRootFolder(userID);
}
return null;
} }
// See IInventoryServices // See IInventoryServices
@ -149,7 +145,7 @@ namespace OpenSim.Framework.Communications
// See IInventoryServices // See IInventoryServices
public void CreateNewUserInventory(LLUUID user) public void CreateNewUserInventory(LLUUID user)
{ {
InventoryFolderBase existingRootFolder = RequestUsersRoot(user); InventoryFolderBase existingRootFolder = RequestRootFolder(user);
if (null != existingRootFolder) if (null != existingRootFolder)
{ {

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

@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
public override bool HasInventoryForUser(LLUUID userID) public override bool HasInventoryForUser(LLUUID userID)
{ {
InventoryFolderBase root = RequestUsersRoot(userID); InventoryFolderBase root = RequestRootFolder(userID);
if (root == null) if (root == null)
{ {
return false; return false;