aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
diff options
context:
space:
mode:
authorDr Scofield2008-10-30 15:26:23 +0000
committerDr Scofield2008-10-30 15:26:23 +0000
commit3a6037b4212818e53743b62e6a8ec5f7ac93e86d (patch)
tree2dcf2b24f0e692c8f0ddccf328d0eca9ec1e9974 /OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
parentFrom: Alan Webb (alan_webb@us.ibm.com) (diff)
downloadopensim-SC-3a6037b4212818e53743b62e6a8ec5f7ac93e86d.zip
opensim-SC-3a6037b4212818e53743b62e6a8ec5f7ac93e86d.tar.gz
opensim-SC-3a6037b4212818e53743b62e6a8ec5f7ac93e86d.tar.bz2
opensim-SC-3a6037b4212818e53743b62e6a8ec5f7ac93e86d.tar.xz
From: Alan Webb (alan_webb@us.ibm.com)
Cleanups in REST inventory and asset services.
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs22
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index db7d1bd..a62a208 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -498,7 +498,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
498 Rest.AssetServices.AddAsset(asset); 498 Rest.AssetServices.AddAsset(asset);
499 499
500 created = true; 500 created = true;
501 rdata.appendStatus(String.Format("<p> Created asset {0}, UUID {1}<p>", 501 rdata.appendStatus(String.Format("<p> Created asset {0}, UUID {1} <p>",
502 asset.Name, asset.ID)); 502 asset.Name, asset.ID));
503 503
504 if (Rest.DEBUG && Rest.DumpAsset) 504 if (Rest.DEBUG && Rest.DumpAsset)
@@ -556,7 +556,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
556 Rest.InventoryServices.MoveFolder(folder); 556 Rest.InventoryServices.MoveFolder(folder);
557 557
558 modified = true; 558 modified = true;
559 rdata.appendStatus(String.Format("<p> Created folder {0}, UUID {1}<p>", 559 rdata.appendStatus(String.Format("<p> Created folder {0}, UUID {1} <p>",
560 folder.Name, folder.ID)); 560 folder.Name, folder.ID));
561 } 561 }
562 else 562 else
@@ -565,7 +565,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
565 Rest.InventoryServices.AddFolder(folder); 565 Rest.InventoryServices.AddFolder(folder);
566 566
567 created = true; 567 created = true;
568 rdata.appendStatus(String.Format("<p> Modified folder {0}, UUID {1}<p>", 568 rdata.appendStatus(String.Format("<p> Modified folder {0}, UUID {1} <p>",
569 folder.Name, folder.ID)); 569 folder.Name, folder.ID));
570 } 570 }
571 } 571 }
@@ -604,7 +604,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
604 MsgId, item.ID, item.AssetID, item.InvType, item.AssetType, item.Name); 604 MsgId, item.ID, item.AssetID, item.InvType, item.AssetType, item.Name);
605 Rest.InventoryServices.UpdateItem(item); 605 Rest.InventoryServices.UpdateItem(item);
606 modified = true; 606 modified = true;
607 rdata.appendStatus(String.Format("<p> Modified item {0}, UUID {1}<p>", item.Name, item.ID)); 607 rdata.appendStatus(String.Format("<p> Modified item {0}, UUID {1} <p>", item.Name, item.ID));
608 } 608 }
609 else 609 else
610 { 610 {
@@ -612,7 +612,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
612 MsgId, item.ID, item.AssetID, item.InvType, item.AssetType, item.Name); 612 MsgId, item.ID, item.AssetID, item.InvType, item.AssetType, item.Name);
613 Rest.InventoryServices.AddItem(item); 613 Rest.InventoryServices.AddItem(item);
614 created = true; 614 created = true;
615 rdata.appendStatus(String.Format("<p> Created item {2}, UUID {3}<p>", item.Name, item.ID)); 615 rdata.appendStatus(String.Format("<p> Created item {0}, UUID {1} <p>", item.Name, item.ID));
616 } 616 }
617 } 617 }
618 618
@@ -705,7 +705,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
705 Rest.AssetServices.AddAsset(asset); 705 Rest.AssetServices.AddAsset(asset);
706 706
707 created = true; 707 created = true;
708 rdata.appendStatus(String.Format("<p> Created asset {0}, UUID {1}<p>", asset.Name, asset.ID)); 708 rdata.appendStatus(String.Format("<p> Created asset {0}, UUID {1} <p>", asset.Name, asset.ID));
709 709
710 if (Rest.DEBUG && Rest.DumpAsset) 710 if (Rest.DEBUG && Rest.DumpAsset)
711 { 711 {
@@ -824,13 +824,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
824 824
825 foreach (InventoryFolderBase f in entity.Folders) 825 foreach (InventoryFolderBase f in entity.Folders)
826 { 826 {
827 rdata.appendStatus(String.Format("<p>Moving folder {0} UUID {1}<p>", f.Name, f.ID)); 827 rdata.appendStatus(String.Format("<p>Moving folder {0} UUID {1} <p>", f.Name, f.ID));
828 Rest.InventoryServices.MoveFolder(f); 828 Rest.InventoryServices.MoveFolder(f);
829 } 829 }
830 830
831 foreach (InventoryItemBase it in entity.Items) 831 foreach (InventoryItemBase it in entity.Items)
832 { 832 {
833 rdata.appendStatus(String.Format("<p>Storing item {0} UUID {1}<p>", it.Name, it.ID)); 833 rdata.appendStatus(String.Format("<p>Storing item {0} UUID {1} <p>", it.Name, it.ID));
834 Rest.InventoryServices.AddItem(it); 834 Rest.InventoryServices.AddItem(it);
835 } 835 }
836 } 836 }
@@ -881,7 +881,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
881 881
882 Rest.InventoryServices.AddItem(xml); 882 Rest.InventoryServices.AddItem(xml);
883 883
884 rdata.appendStatus(String.Format("<p>Storing item {0} UUID {1}<p>", xml.Name, xml.ID)); 884 rdata.appendStatus(String.Format("<p>Storing item {0} UUID {1} <p>", xml.Name, xml.ID));
885 } 885 }
886 886
887 if (created) 887 if (created)
@@ -941,7 +941,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
941 Rest.InventoryServices.MoveFolder(folder); 941 Rest.InventoryServices.MoveFolder(folder);
942 Rest.InventoryServices.PurgeFolder(TrashCan); 942 Rest.InventoryServices.PurgeFolder(TrashCan);
943 943
944 rdata.appendStatus(String.Format("<p>Deleted folder {0} UUID {1}<p>", folder.Name, folder.ID)); 944 rdata.appendStatus(String.Format("<p>Deleted folder {0} UUID {1} <p>", folder.Name, folder.ID));
945 } 945 }
946 946
947 // Deleting items is much more straight forward. 947 // Deleting items is much more straight forward.
@@ -952,7 +952,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
952 Rest.Log.DebugFormat("{0} {1}: Item {2} will be deleted", 952 Rest.Log.DebugFormat("{0} {1}: Item {2} will be deleted",
953 MsgId, rdata.method, rdata.path); 953 MsgId, rdata.method, rdata.path);
954 Rest.InventoryServices.DeleteItem(item); 954 Rest.InventoryServices.DeleteItem(item);
955 rdata.appendStatus(String.Format("<p>Deleted item {0} UUID {1}<p>", item.Name, item.ID)); 955 rdata.appendStatus(String.Format("<p>Deleted item {0} UUID {1} <p>", item.Name, item.ID));
956 } 956 }
957 957
958 rdata.Complete(); 958 rdata.Complete();