Skip to content
Snippets Groups Projects
Commit 3236cbd5 authored by Leslie Linden's avatar Leslie Linden
Browse files

Windows build fix

parent 59189130
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llpanelmarketplaceoutbox.cpp
+ 43
− 46
View file @ 3236cbd5
...@@ -303,53 +303,50 @@ void LLPanelMarketplaceOutbox::onImportGetComplete(U32 status, const LLSD& conte ...@@ -303,53 +303,50 @@ void LLPanelMarketplaceOutbox::onImportGetComplete(U32 status, const LLSD& conte
} }
} }
return;
const LLSD& errors_list = content["errors"];
if (errors_list.size() == 0)
{
LLNotificationsUtil::add("OutboxUploadComplete", LLSD::emptyMap(), LLSD::emptyMap());
}
else
{
LLNotificationsUtil::add("OutboxUploadHadErrors", LLSD::emptyMap(), LLSD::emptyMap());
}
llinfos << "Marketplace upload llsd:" << llendl;
llinfos << ll_pretty_print_sd(content) << llendl;
llinfos << llendl;
const LLSD& imported_list = content["imported"]; //const LLSD& errors_list = content["errors"];
LLSD::array_const_iterator it = imported_list.beginArray();
for ( ; it != imported_list.endArray(); ++it) //if (errors_list.size() == 0)
{ //{
LLUUID imported_folder = (*it).asUUID(); // LLNotificationsUtil::add("OutboxUploadComplete", LLSD::emptyMap(), LLSD::emptyMap());
llinfos << "Successfully uploaded folder " << imported_folder.asString() << " to marketplace." << llendl; //}
} //else
//{
for (it = errors_list.beginArray(); it != errors_list.endArray(); ++it) // LLNotificationsUtil::add("OutboxUploadHadErrors", LLSD::emptyMap(), LLSD::emptyMap());
{ //}
const LLSD& item_error_map = (*it);
//llinfos << "Marketplace upload llsd:" << llendl;
LLUUID error_folder = item_error_map["folder_id"].asUUID(); //llinfos << ll_pretty_print_sd(content) << llendl;
const std::string& error_string = item_error_map["identifier"].asString(); //llinfos << llendl;
LLUUID error_item = item_error_map["item_id"].asUUID();
const std::string& error_item_name = item_error_map["item_name"].asString(); //const LLSD& imported_list = content["imported"];
const std::string& error_message = item_error_map["message"].asString(); //LLSD::array_const_iterator it = imported_list.beginArray();
//for ( ; it != imported_list.endArray(); ++it)
llinfos << "Error item " << error_folder.asString() << ", " << error_string << ", " //{
<< error_item.asString() << ", " << error_item_name << ", " << error_message << llendl; // LLUUID imported_folder = (*it).asUUID();
// llinfos << "Successfully uploaded folder " << imported_folder.asString() << " to marketplace." << llendl;
LLFolderViewFolder * item_folder = mInventoryPanel->getRootFolder()->getFolderByID(error_folder); //}
LLOutboxFolderViewFolder * outbox_item_folder = dynamic_cast<LLOutboxFolderViewFolder *>(item_folder);
//for (it = errors_list.beginArray(); it != errors_list.endArray(); ++it)
llassert(outbox_item_folder); //{
// const LLSD& item_error_map = (*it);
outbox_item_folder->setErrorString(error_string);
} // LLUUID error_folder = item_error_map["folder_id"].asUUID();
// const std::string& error_string = item_error_map["identifier"].asString();
// LLUUID error_item = item_error_map["item_id"].asUUID();
// const std::string& error_item_name = item_error_map["item_name"].asString();
// const std::string& error_message = item_error_map["message"].asString();
// llinfos << "Error item " << error_folder.asString() << ", " << error_string << ", "
// << error_item.asString() << ", " << error_item_name << ", " << error_message << llendl;
//
// LLFolderViewFolder * item_folder = mInventoryPanel->getRootFolder()->getFolderByID(error_folder);
// LLOutboxFolderViewFolder * outbox_item_folder = dynamic_cast<LLOutboxFolderViewFolder *>(item_folder);
// llassert(outbox_item_folder);
// outbox_item_folder->setErrorString(error_string);
//}
} }
void LLPanelMarketplaceOutbox::updateImportButtonStatus() void LLPanelMarketplaceOutbox::updateImportButtonStatus()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment