diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 0c107d5..8a0eba5 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -257,7 +257,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
257 | 257 | ||
258 | if (Rest.InventoryServices.HasInventoryForUser(rdata.uuid)) | 258 | if (Rest.InventoryServices.HasInventoryForUser(rdata.uuid)) |
259 | { | 259 | { |
260 | |||
261 | rdata.root = Rest.InventoryServices.RequestRootFolder(rdata.uuid); | 260 | rdata.root = Rest.InventoryServices.RequestRootFolder(rdata.uuid); |
262 | 261 | ||
263 | Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}", | 262 | Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}", |
@@ -646,7 +645,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
646 | 645 | ||
647 | // Scan the set of folders in the entity collection for an | 646 | // Scan the set of folders in the entity collection for an |
648 | // entry that matches the context folder. It is assumed that | 647 | // entry that matches the context folder. It is assumed that |
649 | // the only reliable indicator of this is a zero UUID ( using | 648 | // the only reliable indicator of this is a zero UUID (using |
650 | // implicit context), or the parent's UUID matches that of the | 649 | // implicit context), or the parent's UUID matches that of the |
651 | // URI designated node (explicit context). We don't allow | 650 | // URI designated node (explicit context). We don't allow |
652 | // ambiguity in this case because this is POST and we are | 651 | // ambiguity in this case because this is POST and we are |
@@ -1368,7 +1367,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1368 | 1367 | ||
1369 | foreach (InventoryFolderBase parent in ic.rdata.folders) | 1368 | foreach (InventoryFolderBase parent in ic.rdata.folders) |
1370 | { | 1369 | { |
1371 | if ( parent.ID == result.ParentID ) | 1370 | if (parent.ID == result.ParentID) |
1372 | { | 1371 | { |
1373 | found = true; | 1372 | found = true; |
1374 | break; | 1373 | break; |
@@ -1382,7 +1381,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1382 | ic.Fail(Rest.HttpStatusCodeBadRequest, | 1381 | ic.Fail(Rest.HttpStatusCodeBadRequest, |
1383 | Rest.HttpStatusDescBadRequest+": invalid parent"); | 1382 | Rest.HttpStatusDescBadRequest+": invalid parent"); |
1384 | } | 1383 | } |
1385 | |||
1386 | } | 1384 | } |
1387 | 1385 | ||
1388 | // This is a new folder, so no existing UUID is available | 1386 | // This is a new folder, so no existing UUID is available |