aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2009-05-22 15:21:49 +0000
committerDr Scofield2009-05-22 15:21:49 +0000
commit6626937e9aa10ca3a717ab15f5b20aace68d7e5e (patch)
tree7d4a8cd3bdc696ee88421bd127a3e8857ad55c53
parentFrom: Alan Webb <alan_webb@us.ibm.com> (diff)
downloadopensim-SC_OLD-6626937e9aa10ca3a717ab15f5b20aace68d7e5e.zip
opensim-SC_OLD-6626937e9aa10ca3a717ab15f5b20aace68d7e5e.tar.gz
opensim-SC_OLD-6626937e9aa10ca3a717ab15f5b20aace68d7e5e.tar.bz2
opensim-SC_OLD-6626937e9aa10ca3a717ab15f5b20aace68d7e5e.tar.xz
From: Alan Webb <alan_webb@us.ibm.com>
- Fix typographical error in RPC response. - Remove obsolete commentary.
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs3
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs4
2 files changed, 1 insertions, 6 deletions
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
2347 s.RegionInfo.EstateSettings.EstateAccess = acl.ToArray(); 2347 s.RegionInfo.EstateSettings.EstateAccess = acl.ToArray();
2348 } 2348 }
2349 2349
2350 responseData["added"] = remk; 2350 responseData["removed"] = remk;
2351
2352 2351
2353 } 2352 }
2354 catch (Exception e) 2353 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
260 // Note that inventory retrieval is an asynchronous event, we use the rdata 260 // Note that inventory retrieval is an asynchronous event, we use the rdata
261 // class instance as the basis for our synchronization. 261 // class instance as the basis for our synchronization.
262 // 262 //
263 // TODO
264 // If something went wrong in inventory processing the thread could stall here
265 // indefinitely. There should be a watchdog timer to fail the request if the
266 // response is not received in a timely fashion.
267 263
268 rdata.uuid = rdata.userProfile.ID; 264 rdata.uuid = rdata.userProfile.ID;
269 265