diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 9ce9a89bee..3a4a68fc63 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -2347,8 +2347,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController s.RegionInfo.EstateSettings.EstateAccess = acl.ToArray(); } - responseData["added"] = remk; - + responseData["removed"] = remk; } catch (Exception e) diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 1a330b1d5c..a10db0cb45 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs @@ -260,10 +260,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory // Note that inventory retrieval is an asynchronous event, we use the rdata // class instance as the basis for our synchronization. // - // TODO - // If something went wrong in inventory processing the thread could stall here - // indefinitely. There should be a watchdog timer to fail the request if the - // response is not received in a timely fashion. rdata.uuid = rdata.userProfile.ID;