summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-08-12 15:16:53 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-08-12 15:16:53 -0700
commit18ee1f48f9f5b8559385b88f86ab8c9bccfcb3c8 (patch)
tree0988afaaa3aec08977af1613ae430fc5d93f4150 /indra
parent10ec0049125317d5c0bdd1bf89b96a54a9b2d873 (diff)
EXP-1069 Outbox sync should auto-delete empty folders
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelmarketplaceoutbox.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llpanelmarketplaceoutbox.cpp b/indra/newview/llpanelmarketplaceoutbox.cpp
index 88feb05114..913a62b897 100644
--- a/indra/newview/llpanelmarketplaceoutbox.cpp
+++ b/indra/newview/llpanelmarketplaceoutbox.cpp
@@ -42,6 +42,7 @@
#include "llagent.h"
#include "llviewermedia.h"
#include "llfolderview.h"
+#include "llinventoryfunctions.h"
static LLRegisterPanelClassWrapper<LLPanelMarketplaceOutbox> t_panel_marketplace_outbox("panel_marketplace_outbox");
@@ -198,7 +199,13 @@ public:
{
// Complete success
llinfos << "success" << llendl;
-
+ LLSD imported_list = content["imported"];
+ LLSD::array_const_iterator it = imported_list.beginArray();
+ for ( ; it != imported_list.endArray(); ++it)
+ {
+ LLUUID imported_folder = (*it).asUUID();
+ remove_category(&gInventory, imported_folder);
+ }
}
else
{