From 1d6e2b418239c7b2cbb9eb473a44888dfc1dc706 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 30 Jul 2015 23:02:12 -0400 Subject: [PATCH] Warning fixies. --- indra/newview/llinventoryfunctions.cpp | 2 +- indra/newview/llinventorypanel.cpp | 2 +- indra/newview/llmarketplacefunctions.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index f198e6769..a5c07a73a 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -1586,7 +1586,7 @@ bool sort_alpha(const LLViewerInventoryCategory* cat1, const LLViewerInventoryCa void dump_trace(std::string& message, S32 depth, LLError::ELevel log_level) { - llinfos << "validate_marketplacelistings : error = "<< log_level << ", depth = " << depth << ", message = " << message << llendl; + LL_INFOS() << "validate_marketplacelistings : error = "<< log_level << ", depth = " << depth << ", message = " << message << LL_ENDL; } // Make all relevant business logic checks on the marketplace listings starting with the folder as argument. diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index e0e8c4294..13e3baba5 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -677,7 +677,7 @@ void LLInventoryPanel::modelChanged(U32 mask) else if (!model_item && view_item) { // Remove the item's UI. - LLFolderViewFolder* parent = view_item->getParentFolder(); + //LLFolderViewFolder* parent = view_item->getParentFolder(); //removeItemID(view_item->getListener()->getUUID()); view_item->destroyView(); } diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index a2aa3ce01..a5ec6be20 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -1804,6 +1804,7 @@ LLUUID LLMarketplaceData::getListingFolder(S32 listing_id) } it++; } + return LLUUID::null; } std::string LLMarketplaceData::getListingURL(const LLUUID& folder_id, S32 depth)