diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 58828d450..30a443be5 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -104,7 +104,7 @@ if (VIEWER)
   endif (LINUX)
 
   add_subdirectory(${VIEWER_PREFIX}newview)
-  add_dependencies(viewer secondlife-bin)
+  add_dependencies(viewer Ascent)
 endif (VIEWER)
 
 # Linux builds the viewer and server in 2 separate projects
diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp
index 1fa81163e..18191cb1c 100644
--- a/indra/newview/llfloaterfriends.cpp
+++ b/indra/newview/llfloaterfriends.cpp
@@ -240,8 +240,8 @@ void LLPanelFriends::populateContactGroupSelect()
 				if ((name == ".") || (name == "..")) continue;
 
 				combo->add(name, ADD_BOTTOM);
-				LLChat msg("Combo Add " + name);
-				LLFloaterChat::addChat(msg);
+				//LLChat msg("Combo Add " + name);
+				//LLFloaterChat::addChat(msg);
 			}
 		}
 	}
diff --git a/indra/newview/skins/default/xui/en-us/panel_friends.xml b/indra/newview/skins/default/xui/en-us/panel_friends.xml
index 6c7135c3a..cf357c583 100644
--- a/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -44,9 +44,9 @@
 		height="18" left="-235" name="buddy_search_lineedit"
 		tool_tip="The friend name you want to search for" width="130" />
 	<pad bottom="-7" height="0" left="-90" width="1" />
-	<button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
+  <!--<button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
 		left_delta="0" name="assign_btn" tool_tip="Asign a friend to a Contact Group"
-		width="80" />
+		width="80" />-->
 	<button bottom_delta="-25" follows="top|right" height="22" label="IM/Call"
 	    left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
 	    width="80" />