From 6626937e9aa10ca3a717ab15f5b20aace68d7e5e Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 22 May 2009 15:21:49 +0000 Subject: From: Alan Webb - Fix typographical error in RPC response. - Remove obsolete commentary. --- OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 3 +-- OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 9ce9a89..3a4a68f 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 1a330b1..a10db0c 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; -- cgit v1.1