diff --git a/BuildParams b/BuildParams
index 3f5225ad49d367bccbca86cd108613c183cdbee9..9b5a9cfb3fd5a51c1b3370b4eef15e591286b788 100644
--- a/BuildParams
+++ b/BuildParams
@@ -77,19 +77,8 @@ viewer-release.build_viewer_update_version_manager = true
 # aimee
 # ========================================
 
-viewer-development-import.build_Linux = true
-viewer-development-import_debug.build_Linux = false
-
-viewer-development-import.build_Darwin = true
-viewer-development-import_debug.build_Darwin = false
-
-viewer-development-import.build_CYGWIN = true
-viewer-development-import.build_CYGWIN_Debug = false
-viewer-development-import.build_CYGWIN_RelWithDebInfo = false
-viewer-development-import.build_CYGWIN_Release = true
-viewer-development-import_debug.build_CYGWIN_Debug = true
-viewer-development-import_debug.build_CYGWIN_RelWithDebInfo = true
-viewer-development-import_debug.build_CYGWIN_Release = false
+viewer-development-import.build_debug_release_separately = true
+viewer-development-fixes.build_debug_release_separately = true
 
 # =======================================
 # brad
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index f266af03eeab1dbc16cba213a143b9d68990efd7..b28399a36b6acb62e9dbddd7f807ce8894568852 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -87,6 +87,9 @@ bool LLFlatListView::addItem(LLPanel * item, const LLSD& value /*= LLUUID::null*
 		mItemsPanel->addChild(item);
 		break;
 	default:
+		LL_WARNS("") << "Unsupported position." << LL_ENDL;
+		delete new_pair;
+		return false;
 		break;
 	}
 	
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index 8667af048bfe1e23758214eb467fed28ab23383a..afd0176d987c144f65aa65edc295e2e7c59e4ddd 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -54,6 +54,7 @@
  */
 class LLFlatListView : public LLScrollContainer, public LLEditMenuHandler
 {
+	LOG_CLASS(LLFlatListView);
 public:
 
 	/**
@@ -448,6 +449,7 @@ private:
  */
 class LLFlatListViewEx : public LLFlatListView
 {
+	LOG_CLASS(LLFlatListViewEx);
 public:
 	struct Params : public LLInitParam::Block<Params, LLFlatListView::Params>
 	{
diff --git a/indra/newview/llinventoryitemslist.h b/indra/newview/llinventoryitemslist.h
index 17131549e77455a78fdb757ba75e377b7de6ae99..ca90427659b1b593c9a0dc79820faa863e06d022 100644
--- a/indra/newview/llinventoryitemslist.h
+++ b/indra/newview/llinventoryitemslist.h
@@ -38,6 +38,7 @@ class LLViewerInventoryItem;
 
 class LLInventoryItemsList : public LLFlatListViewEx
 {
+	LOG_CLASS(LLInventoryItemsList);
 public:
 	struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>
 	{
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 15729b5175a13aa32e7701fefa86792909d36eb8..2e003dd2b82992d26b60c851d02a107275b5cd39 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -7111,6 +7111,13 @@ void LLVivoxProtocolParser::reset()
 	alias.clear();
 	numberOfAliases = 0;
 	applicationString.clear();
+	id = 0;
+	nameString.clear();
+	descriptionString.clear();
+	expirationDate = LLDate();
+	hasExpired = false;
+	fontType = 0;
+	fontStatus = 0;
 }
 
 //virtual 
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
index 4806fb35bf213212ea06989b23af3d23e2ded6d6..854c37c2c1105e2b350e49236a902c732a955c83 100644
--- a/indra/newview/llwearableitemslist.h
+++ b/indra/newview/llwearableitemslist.h
@@ -384,6 +384,7 @@ private:
  */
 class LLWearableItemsList : public LLInventoryItemsList
 {
+	LOG_CLASS(LLWearableItemsList);
 public:
 	/**
 	 * Context menu.