diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp
index 95e7f94f96..6d56c8c1e9 100644
--- a/indra/newview/fsfloatercontacts.cpp
+++ b/indra/newview/fsfloatercontacts.cpp
@@ -987,4 +987,11 @@ void FSFloaterContacts::sendRightsGrant(rights_map_t& ids)
 	gAgent.sendReliableMessage();
 }
 
+void FSFloaterContacts::childShowTab(const std::string& id, const std::string& tabname )
+{
+	LLTabContainer* child = findChild<LLTabContainer>(id);
+	if (child)
+		child->selectTabByName(tabname);
+}
+
 // EOF
diff --git a/indra/newview/fsfloatercontacts.h b/indra/newview/fsfloatercontacts.h
index 9639f1514e..e9c273244d 100644
--- a/indra/newview/fsfloatercontacts.h
+++ b/indra/newview/fsfloatercontacts.h
@@ -142,6 +142,8 @@ private:
 	LLCachedControl<bool>	mSortByUserName;
 
 	std::string				mFriendListFontName;
+
+	void childShowTab(const std::string& id, const std::string& tabname);
 };
 
 
diff --git a/indra/newview/fsfloaterimport.cpp b/indra/newview/fsfloaterimport.cpp
index 57856eaaf7..6e3d1c7411 100644
--- a/indra/newview/fsfloaterimport.cpp
+++ b/indra/newview/fsfloaterimport.cpp
@@ -65,6 +65,8 @@
 #include "llvfile.h"
 #include "llvfs.h"
 #include "llvolumemessage.h"
+#include "llviewerstats.h"
+#include "lltrace.h"
 #include "fsexportperms.h"
 #include "material_codes.h"
 #include <boost/algorithm/string_regex.hpp>
@@ -707,7 +709,7 @@ void FSFloaterImport::createPrim()
 	gMessageSystem->addU8Fast(_PREHASH_State, (U8)0);
 	gMessageSystem->addUUIDFast(_PREHASH_RayTargetID, LLUUID::null);
 	gMessageSystem->sendReliable(gAgent.getRegion()->getHost());
-	LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CREATE_COUNT);
+	add(LLStatViewer::OBJECT_CREATE);
 }
 
 bool FSFloaterImport::processPrimCreated(LLViewerObject* object)
@@ -1207,7 +1209,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
 			url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
 			new_file_agent_inventory = true;
 		}
-		LLViewerStats::getInstance()->incStat(LLViewerStats::ST_UPLOAD_TEXTURE_COUNT);
+		add(LLStatViewer::UPLOAD_TEXTURE_COUNT);
 	}
 		break;
 	case LLAssetType::AT_SOUND:
@@ -1223,7 +1225,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
 		{
 			url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
 			new_file_agent_inventory = true;
-			LLViewerStats::getInstance()->incStat(LLViewerStats::ST_UPLOAD_SOUND_COUNT);
+			add(LLVStatViewer::UPLOAD_SOUND_COUNT);
 		}
 		
 	}
@@ -1339,7 +1341,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
 		{
 			url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
 			new_file_agent_inventory = true;
-			LLViewerStats::getInstance()->incStat(LLViewerStats::ST_UPLOAD_ANIM_COUNT);
+			add(LLStatViewer::UPLOAD_ANIM_COUNT);
 		}
 	}
 		break;
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index a3f97ed5f0..b6baff2beb 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -1339,7 +1339,7 @@ void send_chat_from_nearby_floater(std::string utf8_out_text, EChatType type, S3
 	}
 	
 	// moved here so we don't bump the count for every message segment
-	LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
+	add(LLStatViewer::CHAT_COUNT,1);
 	//</FS:TS> FIRE-787
 }
 
diff --git a/indra/newview/fsfloatervolumecontrols.cpp b/indra/newview/fsfloatervolumecontrols.cpp
index 8b319a68b8..d72b9d6014 100644
--- a/indra/newview/fsfloatervolumecontrols.cpp
+++ b/indra/newview/fsfloatervolumecontrols.cpp
@@ -62,7 +62,7 @@ BOOL FSFloaterVolumeControls::postBuild()
 void FSFloaterVolumeControls::handleVisibilityChange(BOOL new_visibility)
 {
 	UtilityBar::instance().setVolumeControlsButtonExpanded(new_visibility);
-	LLFloater::handleVisibilityChange(new_visibility);
+	LLFloater::onVisibilityChange(new_visibility);
 }
 
 //<FS:KC> Handled centrally now
diff --git a/indra/newview/fsnearbychathub.cpp b/indra/newview/fsnearbychathub.cpp
index 59279ea1e5..ab9fd9e956 100644
--- a/indra/newview/fsnearbychathub.cpp
+++ b/indra/newview/fsnearbychathub.cpp
@@ -207,7 +207,7 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe
 	}
 
 	// moved here so we don't bump the count for every message segment
-	LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
+	add(LLStatViewer::CHAT_COUNT,1);
 //</FS:TS> FIRE-787
 }