diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-09-17 16:01:11 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-09-17 16:01:11 +0000 |
| commit | e3d0761b5eb2ead6ccaa1bcd871b754c5e5ff65c (patch) | |
| tree | 51979eb7811ff3cdf61b9241b342f5482f9737f6 /indra/newview | |
| parent | 13c391f1984bb8cb9d67a7729af2ee5714409215 (diff) | |
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.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimpanel.cpp | 15 | ||||
| -rw-r--r-- | indra/newview/llimpanel.h | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index d57f5bf1f2..8d628d1b4f 100644 --- a/indra/newview/llimpanel.cpp +++ b/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 ) diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h index f780bcb2bb..dbe09fb396 100644 --- a/indra/newview/llimpanel.h +++ b/indra/newview/llimpanel.h @@ -187,7 +187,6 @@ public: 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 ); |