aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
authorMelanie Thielker2016-07-04 03:35:48 +0100
committerMelanie Thielker2016-07-04 03:35:48 +0100
commitea8f3c83bf96453e8223d918933d5708fa49a3cc (patch)
tree288972a5d6f112426da2b5ab109fe18ba5aedc2e /OpenSim/ApplicationPlugins/RemoteController
parentincrease xmlrpc timeout in xmlrpcgroups, disable its cache until its entries ... (diff)
downloadopensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.zip
opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.tar.gz
opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.tar.bz2
opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.tar.xz
Finally remove the requirement for an InventoryItem/FolderBase object to
be passed into inventory queries. This makes the API more homogenous and also will more clearly show coding errors related to HG inventory where the .Owner field has a meaning for a query but wasn't always set.
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index bae1582..1a7c698 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -2836,8 +2836,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2836 if (wearable[0].ItemID != UUID.Zero) 2836 if (wearable[0].ItemID != UUID.Zero)
2837 { 2837 {
2838 // Get inventory item and copy it 2838 // Get inventory item and copy it
2839 InventoryItemBase item = new InventoryItemBase(wearable[0].ItemID, source); 2839 InventoryItemBase item = inventoryService.GetItem(source, wearable[0].ItemID);
2840 item = inventoryService.GetItem(item);
2841 2840
2842 if (item != null) 2841 if (item != null)
2843 { 2842 {
@@ -2890,8 +2889,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2890 if (itemID != UUID.Zero) 2889 if (itemID != UUID.Zero)
2891 { 2890 {
2892 // Get inventory item and copy it 2891 // Get inventory item and copy it
2893 InventoryItemBase item = new InventoryItemBase(itemID, source); 2892 InventoryItemBase item = inventoryService.GetItem(source, itemID);
2894 item = inventoryService.GetItem(item);
2895 2893
2896 if (item != null) 2894 if (item != null)
2897 { 2895 {