svn merge -r 68785:68784 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

Revert change for SL-51198 ("VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button"), per Ben - more comprehensive design coming through Rx soon.

doc/contributions.txt

@@ -107,8 +107,6 @@ Grazer Kline
 	VWR-1092
 Gudmund Shepherd
 	VWR-1594
-Hamncheese Omlet
-	VWR-333
 Henri Beauchamp
 	VWR-1406
 Hikkoshi Sakai
@@ -218,7 +216,6 @@ Paul Churchill
 	VWR-1567
 	VWR-1647
 	VWR-1880
-	VWR-2072
 Paula Innis
 	VWR-30
 	VWR-293

indra/newview/llimpanel.cpp

@@ -966,7 +966,6 @@ BOOL LLFloaterIMPanel::postBuild()
 		childSetAction("end_call_btn", onClickEndCall, this);
 		childSetAction("send_btn", onClickSend, this);
 		childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
-		childSetAction("offer_tp_btn", onClickOfferTeleport, this);
 
 		//LLButton* close_btn = LLUICtrlFactory::getButtonByName(this, "close_btn");
 		//close_btn->setClickedCallback(&LLFloaterIMPanel::onClickClose, this);
@@ -1060,13 +1059,6 @@ void LLFloaterIMPanel::draw()
 	childSetEnabled("start_call_btn", enable_connect);
 	childSetEnabled("send_btn", !childGetValue("chat_editor").asString().empty());
 
-	const LLRelationship* info = NULL;
-	info = LLAvatarTracker::instance().getBuddyInfo(mOtherParticipantUUID);
-	if (info)
-	{
-		childSetEnabled("offer_tp_btn", info->isOnline());
-	}
-
 	if (mAutoConnect && enable_connect)
 	{
 		onClickStartCall(this);
@@ -1393,13 +1385,6 @@ void LLFloaterIMPanel::onTabClick(void* userdata)
 	self->setInputFocus(TRUE);
 }
 
-// static
-void LLFloaterIMPanel::onClickOfferTeleport(void* userdata)
-{
-	LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
-
-	handle_lure(self->mOtherParticipantUUID);
-}
 
 // static
 void LLFloaterIMPanel::onClickProfile( void* userdata )

indra/newview/llimpanel.h

@@ -187,7 +187,6 @@ class LLFloaterIMPanel : public LLFloater
 
 	static void		onClickProfile( void* userdata );
 	static void		onClickGroupInfo( void* userdata );
-	static void		onClickOfferTeleport( void* userdata );
 	static void		onClickClose( void* userdata );
 	static void		onClickStartCall( void* userdata );
 	static void		onClickEndCall( void* userdata );