ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Refactor: Remove the unused userID parameter that was being passed into almost every inventory method

Browse Source 
* This allows lots of redundant inventory methods with only slightly different names to be eliminated.
This commit is contained in:
Justin Clarke Casey
2008-05-01 20:47:33 +00:00
parent e41232bac5
commit 1de6cffa28
9 changed files with 155 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,41 +80,6 @@ namespace OpenSim.Region.Communications.Local
callback(userID, folders, items);
}
public override void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder)
{
AddFolder(folder);
}
public override void MoveExistingInventoryFolder(InventoryFolderBase folder)
{
MoveFolder(folder);
}
public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
{
AddItem(item);
}
public override void UpdateInventoryItem(LLUUID userID, InventoryItemBase item)
{
UpdateItem(item);
}
public override void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
{
DeleteItem(item);
}
/// <summary>
/// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
/// </summary>
/// <param name="userID"></param>
/// <param name="folder"></param>
public override void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder)
{
PurgeFolder(folder);
}
public override bool HasInventoryForUser(LLUUID userID)
{
InventoryFolderBase root = RequestRootFolder(userID);

54
OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
View File

@@ -154,14 +154,12 @@ namespace OpenSim.Region.Communications.OGS1
/// <summary>
/// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
/// </summary>
/// <param name="userID"></param>
/// <param name="folder"></param>
public void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder)
/// </summary>
public bool AddFolder(InventoryFolderBase folder)
{
try
{
SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
return SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
"POST", _inventoryServerUrl + "/NewFolder/", folder);
}
catch (WebException e)
@@ -169,18 +167,19 @@ namespace OpenSim.Region.Communications.OGS1
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}",
e.Source, e.Message);
}
return false;
}
/// <summary>
/// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
/// </summary>
/// <param name="userID"></param>
/// <param name="folder"></param>
public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder)
public bool MoveFolder(InventoryFolderBase folder)
{
try
{
SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
return SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
"POST", _inventoryServerUrl + "/MoveFolder/", folder);
}
catch (WebException e)
@@ -188,19 +187,18 @@ namespace OpenSim.Region.Communications.OGS1
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}",
e.Source, e.Message);
}
return false;
}
/// <summary>
/// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
/// </summary>
/// <param name="userID"></param>
/// <param name="folder"></param>
/// <returns></returns>
public void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder)
public bool PurgeFolder(InventoryFolderBase folder)
{
try
{
SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
return SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
"POST", _inventoryServerUrl + "/PurgeFolder/", folder);
}
catch (WebException e)
@@ -208,33 +206,35 @@ namespace OpenSim.Region.Communications.OGS1
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}",
e.Source, e.Message);
}
return false;
}
/// <summary>
/// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
/// </summary>
/// <param name="userID"></param>
/// <param name="folder"></param>
public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
/// </summary>
public bool AddItem(InventoryItemBase item)
{
try
{
SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
return SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
"POST", _inventoryServerUrl + "/NewItem/", item);
}
catch (WebException e)
{
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}",
e.Source, e.Message);
}
}
return false;
}
// TODO: this is a temporary workaround, the UpdateInventoryItem method need to be implemented
public void UpdateInventoryItem(LLUUID userID, InventoryItemBase item)
public bool UpdateItem(InventoryItemBase item)
{
try
{
SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
return SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
"POST", _inventoryServerUrl + "/NewItem/", item);
}
catch (WebException e)
@@ -242,18 +242,18 @@ namespace OpenSim.Region.Communications.OGS1
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}",
e.Source, e.Message);
}
return false;
}
/// <summary>
/// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
/// </summary>
/// <param name="userID"></param>
/// <param name="folder"></param>
public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
/// </summary>
public bool DeleteItem(InventoryItemBase item)
{
try
{
SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
return SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
"POST", _inventoryServerUrl + "/DeleteItem/", item);
}
catch (WebException e)
@@ -261,6 +261,8 @@ namespace OpenSim.Region.Communications.OGS1
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}",
e.Source, e.Message);
}
return false;
}
public bool HasInventoryForUser(LLUUID userID)