From 6a911a9e8ad58b8b1c3cb4a056268c172ea263c0 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 10 Jun 2014 19:19:22 +0200
Subject: [PATCH 1/2] Stats changes v2.

---
 indra/newview/fsfloaterimport.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/fsfloaterimport.cpp b/indra/newview/fsfloaterimport.cpp
index 6e3d1c7411..4f74c35983 100644
--- a/indra/newview/fsfloaterimport.cpp
+++ b/indra/newview/fsfloaterimport.cpp
@@ -709,7 +709,7 @@ void FSFloaterImport::createPrim()
 	gMessageSystem->addU8Fast(_PREHASH_State, (U8)0);
 	gMessageSystem->addUUIDFast(_PREHASH_RayTargetID, LLUUID::null);
 	gMessageSystem->sendReliable(gAgent.getRegion()->getHost());
-	add(LLStatViewer::OBJECT_CREATE);
+	LLTrace::add(LLStatViewer::OBJECT_CREATE,1);
 }
 
 bool FSFloaterImport::processPrimCreated(LLViewerObject* object)
@@ -1209,7 +1209,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
 			url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
 			new_file_agent_inventory = true;
 		}
-		add(LLStatViewer::UPLOAD_TEXTURE_COUNT);
+		LLTrace::add(LLStatViewer::UPLOAD_TEXTURE,1);
 	}
 		break;
 	case LLAssetType::AT_SOUND:
@@ -1225,7 +1225,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
 		{
 			url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
 			new_file_agent_inventory = true;
-			add(LLVStatViewer::UPLOAD_SOUND_COUNT);
+			LLTrace::add(LLVStatViewer::UPLOAD_SOUND,1);
 		}
 		
 	}
@@ -1341,7 +1341,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
 		{
 			url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
 			new_file_agent_inventory = true;
-			add(LLStatViewer::UPLOAD_ANIM_COUNT);
+			LLTrace::add(LLStatViewer::UPLOAD_ANIM_COUNT,1);
 		}
 	}
 		break;

From 108cd8024043ae6fa077e5d1c13adcea51a522c9 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 10 Jun 2014 19:19:39 +0200
Subject: [PATCH 2/2] Fix merge error.

---
 indra/newview/llclassifiedstatsresponder.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/indra/newview/llclassifiedstatsresponder.cpp b/indra/newview/llclassifiedstatsresponder.cpp
index 81d7bc9113..59660323cd 100755
--- a/indra/newview/llclassifiedstatsresponder.cpp
+++ b/indra/newview/llclassifiedstatsresponder.cpp
@@ -54,14 +54,13 @@ void LLClassifiedStatsResponder::result(const LLSD& content)
 	S32 search_profile = content["search_profile_clicks"].asInteger();
 
 	LLPanelClassifiedInfo::setClickThrough(	mClassifiedID, 
-		mClassifiedID, 
 		teleport + search_teleport, 
 		map + search_map,
 		profile + search_profile,
 		true);
 
 	// <FS:Ansariel> FIRE-8787: Also update legacy profiles
-	FSPanelClassifiedInfo::setClickThrough(
+	FSPanelClassifiedInfo::setClickThrough( mClassifiedID,
 											teleport + search_teleport, 
 											map + search_map,
 											profile + search_profile,