diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 7cecc062f..f5ebef4e6 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -330,6 +330,13 @@ void LLPanelAvatarFirstLife::enableControls(BOOL self)
 void show_picture(const LLUUID& id, const std::string& name);
 static std::string profile_picture_title(const std::string& str) { return "Profile Picture: " + str; }
 static void show_partner_help() { LLNotificationsUtil::add("ClickPartnerHelpAvatar", LLSD(), LLSD(), boost::bind(LLPanelAvatarSecondLife::onClickPartnerHelpLoadURL, _1, _2)); }
+void show_log_browser(const LLUUID& id)
+{
+	void show_log_browser(const std::string& name, const std::string& id);
+	LLAvatarName av_name;
+	LLAvatarNameCache::get(id, &av_name);
+	show_log_browser(av_name->getLegacyName(), id.asString());
+}
 BOOL LLPanelAvatarSecondLife::postBuild()
 {
 	childSetEnabled("born", FALSE);
@@ -359,6 +366,7 @@ BOOL LLPanelAvatarSecondLife::postBuild()
 	getChild<LLUICtrl>("GroupInvite_Button")->setCommitCallback(boost::bind(static_cast<void(*)(const LLUUID&)>(LLAvatarActions::inviteToGroup), boost::bind(&LLPanelAvatar::getAvatarID, pa)));
 
 	getChild<LLUICtrl>("Add Friend...")->setCommitCallback(boost::bind(LLAvatarActions::requestFriendshipDialog, boost::bind(&LLPanelAvatar::getAvatarID, pa)));
+	getChild<LLUICtrl>("Log")->setCommitCallback(boost::bind(show_log_browser, boost::bind(&LLPanelAvatar::getAvatarID, pa)));
 	getChild<LLUICtrl>("Pay...")->setCommitCallback(boost::bind(LLAvatarActions::pay, boost::bind(&LLPanelAvatar::getAvatarID, pa)));
 	if (LLUICtrl* ctrl = findChild<LLUICtrl>("Mute"))
 	{
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 305165524..e483c0480 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9058,6 +9058,17 @@ class ListShare : public view_listener_t
 	}
 };
 
+class ListShowLog : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		void show_log_browser(const LLUUID& id)
+		for (const LLUUID& id : get_focused_list_ids_selected())
+			show_log_browser(id);
+		return true;
+	}
+};
+
 class ListShowProfile : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9514,6 +9525,7 @@ void initialize_menus()
 	addMenu(new ListRequestFriendship(), "List.RequestFriendship");
 	addMenu(new ListRequestTeleport(), "List.RequestTeleport");
 	addMenu(new ListShare(), "List.Share");
+	addMenu(new ListShowLog(), "List.ListShowLog");
 	addMenu(new ListShowProfile(), "List.ShowProfile");
 	addMenu(new ListShowWebProfile(), "List.ShowWebProfile");
 	addMenu(new ListStartAdhocCall(), "List.StartAdhocCall");
diff --git a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
index 1bd2aea10..1e66307c2 100644
--- a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
@@ -60,6 +60,10 @@
     <on_click function="List.Share"/>
     <on_visible function="List.EnableSingleSelected"/>
   </menu_item_call>
+  <menu_item_call label="Chat History" name="Chat History">
+    <on_click function="List.ShowLog"/>
+    <on_enable function="List.EnableAnySelected"/>
+  </menu_item_call>
   <menu_item_separator/>
   <menu_item_call label="Mute/Unmute" name="Mute/Unmute">
     <on_click function="List.ToggleMute"/>
diff --git a/indra/newview/skins/default/xui/en-us/menu_radar.xml b/indra/newview/skins/default/xui/en-us/menu_radar.xml
index 540416be0..b2d37ecfb 100644
--- a/indra/newview/skins/default/xui/en-us/menu_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_radar.xml
@@ -61,6 +61,10 @@
       <on_click function="List.Share"/>
       <on_visible function="List.EnableSingleSelected"/>
     </menu_item_call>
+    <menu_item_call label="Chat History" name="Chat History">
+      <on_click function="List.ShowLog"/>
+      <on_enable function="List.EnableAnySelected"/>
+    </menu_item_call>
     <menu_item_call label="Track/Untrack" name="Track/Untrack">
       <on_click function="Radar.Track"/>
       <on_enable function="List.EnableSingleSelected"/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 5e3b1f832..efc91900a 100644
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -146,11 +146,12 @@
 			     label_selected="Find on Map" left="24" mouse_opaque="true"
 			     name="Find on Map" width="100" />
 			<button bottom="-452" font="SansSerif" halign="center" height="20"
-			     label="Offer Teleport..." label_selected="Offer Teleport..."
-			     left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />
+			     label="Teleport..." label_selected="Teleport..."
+			     left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="80" />
 			<button bottom="-452" font="SansSerif" halign="center" height="20"
-			     label="Add Friend..." label_selected="Add Friend..." left_delta="142"
+			     label="Add Friend..." label_selected="Add Friend..." left_delta="82"
 			     mouse_opaque="true" name="Add Friend..." width="130" />
+			<button label="Log" name="Log" bottom="-452" left_delta="132" height="20" width="56"/>
 			<button bottom="-470" font="SansSerif" halign="center" height="20" label="Pay..."
 			     label_selected="Pay..." left="24" mouse_opaque="true" name="Pay..."
 			     width="70" />