diff --git a/indra/newview/ascentfloatercontactgroups.cpp b/indra/newview/ascentfloatercontactgroups.cpp
index 4c279a784..1012dcd53 100644
--- a/indra/newview/ascentfloatercontactgroups.cpp
+++ b/indra/newview/ascentfloatercontactgroups.cpp
@@ -110,7 +110,7 @@ void ASFloaterContactGroups::populateGroupList()
 			{
 				LLChat msg("Found: " + name);
 				LLFloaterChat::addChat(msg);
-				scroller->addSimpleElement(name, ADD_BOTTOM);
+				scroller->addSimpleElement(name.substr(0, -4), ADD_BOTTOM);
 			}
 			else
 			{
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 962ab5d47..6655bc7da 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -763,10 +763,11 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 	if (mGroupNameEditor) mGroupNameEditor->setVisible(FALSE);
 	if (mFounderName) mFounderName->setNameID(gdatap->mFounderID,FALSE);
 
-
-
-
-
+	LLNameEditor* key_edit = getChild<LLNameEditor>("group_key");
+	if(key_edit)
+	{
+		key_edit->setText(gdatap->getID().asString());
+	}
 
 	if (mInsignia)
 	{
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 06d03f91a..9d84f1403 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -417,7 +417,7 @@ void handle_leave_god_mode(void*);
 
 // <edit>
 void handle_fake_away_status(void*);
-
+void handle_area_search(void*);
 void handle_pose_stand_ltao(void*);
 void handle_pose_stand_ltah(void*);
 void handle_pose_stand_ltad(void*);
@@ -748,6 +748,7 @@ void init_menus()
 	LLMenuGL*menu;
 
 	menu = new LLMenuGL("Ascent");
+	menu->append(new LLMenuItemCallGL(	"Object Area Search", &handle_area_search, NULL));
 	menu->append(new LLMenuItemCallGL(  "Fake Away Status", &handle_fake_away_status, NULL));
 	menu->append(new LLMenuItemCallGL(  "Force Ground Sit", &handle_force_ground_sit, NULL));
 	menu->append(new LLMenuItemCallGL(  "Phantom Avatar", &handle_phantom_avatar, NULL));
@@ -3479,6 +3480,10 @@ void handle_pose_stand_stop(void*)
 	}
 }
 // </dogmode> ---------------------------------------------------
+void handle_area_search(void*)
+{
+	JCFloaterAreaSearch::toggle();
+}
 
 void handle_fake_away_status(void*)
 {
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 ec2beffbd..1767c679f 100644
--- a/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -45,9 +45,9 @@
 		<column name="friend_last_update_generation" width="0" />
 	</scroll_list>
 	<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" />