DD-92 : Clear llinfos compilation warning and similar

4 files changed, 6 insertions, 14 deletions

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index ba519c8899..88abd9ff9d 100755
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -222,8 +222,7 @@ BOOL LLFloaterMarketplaceListings::postBuild()
 	mCategoryAddedObserver = new LLMarketplaceListingsAddedObserver(this);
 	gInventory.addObserver(mCategoryAddedObserver);
 	
-    // Merov : Debug : fetch aggressively so we can create test data right onOpen()
-    llinfos << "Merov : postBuild, do fetchContent() ahead of time" << llendl;
+    // Debug : fetch aggressively so we can create test data right onOpen()
 	fetchContents();
 
 	return TRUE;
@@ -276,8 +275,7 @@ void LLFloaterMarketplaceListings::setup()
 	if (marketplacelistings_id.isNull())
 	{
 		// We should never get there unless the inventory fails badly
-		llinfos << "Merov : Inventory problem: failure to create the marketplace listings folder for a merchant!" << llendl;
-		llerrs << "Inventory problem: failure to create the marketplace listings folder for a merchant!" << llendl;
+		LL_ERRS("SLM") << "Inventory problem: failure to create the marketplace listings folder for a merchant!" << LL_ENDL;
 		return;
 	}
     
@@ -287,8 +285,7 @@ void LLFloaterMarketplaceListings::setup()
     
     if (marketplacelistings_id == mRootFolderId)
     {
-        llinfos << "Merov : Inventory warning: Marketplace listings folder already set" << llendl;
-        llwarns << "Inventory warning: Marketplace listings folder already set" << llendl;
+        LL_WARNS("SLM") << "Inventory warning: Marketplace listings folder already set" << LL_ENDL;
         return;
     }
     mRootFolderId = marketplacelistings_id;
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index f911b12b55..263e6655f6 100755
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -306,10 +306,6 @@ bool LLInventorySort::operator()(const LLFolderViewModelItemInventory* const& a,
     {
         S32 weight_a = compute_stock_count(a->getUUID());
         S32 weight_b = compute_stock_count(b->getUUID());
-        if ((weight_a != -1) || (weight_b != -1))
-        {
-            llinfos << "Merov : sort by weight, a = " << a->getName() << ", " << weight_a << ", b = " << b->getName() << ", " << weight_b << llendl;
-        }
 		if (weight_a == weight_b)
 		{
             // Equal weight -> use alphabetical order
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index baa2a08933..5dc2385f04 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -166,7 +166,7 @@ void update_marketplace_category(const LLUUID& cur_uuid)
             if (version_folder_uuid.notNull() && !gInventory.isObjectDescendentOf(version_folder_uuid, listing_uuid))
             {
                 // *TODO : Confirm with Producer that this is what we want to happen in that case!
-                llinfos << "Merov : Unlist as the version folder is not under the listing folder anymore!!" << llendl;
+                LL_INFOS("SLM") << "Unlist as the version folder is not under the listing folder anymore!!" << LL_ENDL;
                 LLMarketplaceData::instance().setVersionFolder(listing_uuid, LLUUID::null);
                 LLMarketplaceData::instance().activateListing(listing_uuid, false);
             }
@@ -180,7 +180,7 @@ void update_marketplace_category(const LLUUID& cur_uuid)
         if (LLMarketplaceData::instance().isListed(cur_uuid))
         {
             // *TODO : Confirm with Producer that this is what we want to happen in that case!
-            llinfos << "Merov : Disassociate as the listing folder is not under the marketplace folder anymore!!" << llendl;
+            LL_INFOS("SLM") << "Disassociate as the listing folder is not under the marketplace folder anymore!!" << LL_ENDL;
             LLMarketplaceData::instance().clearListing(cur_uuid);
         }
     }
@@ -1008,7 +1008,7 @@ int get_folder_path_length(const LLUUID& ancestor_id, const LLUUID& descendant_i
 		category = gInventory.getCategory(parent_id);
 	}
     
-	llwarns << "get_folder_path_length() couldn't trace a path from the descendant to the ancestor" << llendl;
+	LL_WARNS("SLM") << "get_folder_path_length() couldn't trace a path from the descendant to the ancestor" << LL_ENDL;
 	return -1;
 }
 
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 06e517a861..0bfcea41b7 100755
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -1022,7 +1022,6 @@ void LLLoadHistoryThread::run()
 	{
 		loadHistory(mFileName, mMessages, mLoadParams);
 		int count = mMessages->size();
-		llinfos << "mMessages->size(): " << count << llendl;
 		setFinished();
 	}
 }