diff options
author | Paul Churchill | 2008-09-20 12:27:44 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-20 12:27:44 -0500 |
commit | 7d5d0904c14a9185293386218dd707a3e1cad40e (patch) | |
tree | 325c5e0846f4eaad47479c2c079a6aa817e0bf65 /linden/indra/newview/llimpanel.cpp | |
parent | New optional SConstruct flag to specify an exact path to build (diff) | |
download | meta-impy-7d5d0904c14a9185293386218dd707a3e1cad40e.zip meta-impy-7d5d0904c14a9185293386218dd707a3e1cad40e.tar.gz meta-impy-7d5d0904c14a9185293386218dd707a3e1cad40e.tar.bz2 meta-impy-7d5d0904c14a9185293386218dd707a3e1cad40e.tar.xz |
VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button.
Diffstat (limited to 'linden/indra/newview/llimpanel.cpp')
-rw-r--r-- | linden/indra/newview/llimpanel.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index ae8bd4b..46a64d4 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp | |||
@@ -1246,6 +1246,7 @@ BOOL LLFloaterIMPanel::postBuild() | |||
1246 | childSetAction("end_call_btn", onClickEndCall, this); | 1246 | childSetAction("end_call_btn", onClickEndCall, this); |
1247 | childSetAction("send_btn", onClickSend, this); | 1247 | childSetAction("send_btn", onClickSend, this); |
1248 | childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this); | 1248 | childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this); |
1249 | childSetAction("offer_tp_btn", onClickOfferTeleport, this); | ||
1249 | 1250 | ||
1250 | childSetAction("moderator_kick_speaker", onKickSpeaker, this); | 1251 | childSetAction("moderator_kick_speaker", onKickSpeaker, this); |
1251 | //LLButton* close_btn = getChild<LLButton>("close_btn"); | 1252 | //LLButton* close_btn = getChild<LLButton>("close_btn"); |
@@ -1395,6 +1396,20 @@ void LLFloaterIMPanel::draw() | |||
1395 | childSetValue("mute_btn", LLMuteList::getInstance()->isMuted(mOtherParticipantUUID, LLMute::flagVoiceChat)); | 1396 | childSetValue("mute_btn", LLMuteList::getInstance()->isMuted(mOtherParticipantUUID, LLMute::flagVoiceChat)); |
1396 | childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive()); | 1397 | childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive()); |
1397 | } | 1398 | } |
1399 | |||
1400 | // enable 'offer teleport' button | ||
1401 | if(mDialog == IM_NOTHING_SPECIAL) | ||
1402 | { | ||
1403 | const LLRelationship* info = NULL; | ||
1404 | info = LLAvatarTracker::instance().getBuddyInfo(mOtherParticipantUUID); | ||
1405 | childSetEnabled("offer_tp_btn", info->isOnline()); | ||
1406 | } | ||
1407 | else | ||
1408 | { | ||
1409 | childSetEnabled("offer_tp_btn", false); | ||
1410 | childSetVisible("offer_tp_button", false); | ||
1411 | } | ||
1412 | |||
1398 | LLFloater::draw(); | 1413 | LLFloater::draw(); |
1399 | } | 1414 | } |
1400 | 1415 | ||
@@ -1694,6 +1709,13 @@ void LLFloaterIMPanel::onTabClick(void* userdata) | |||
1694 | self->setInputFocus(TRUE); | 1709 | self->setInputFocus(TRUE); |
1695 | } | 1710 | } |
1696 | 1711 | ||
1712 | // static | ||
1713 | void LLFloaterIMPanel::onClickOfferTeleport(void* userdata) | ||
1714 | { | ||
1715 | LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata; | ||
1716 | |||
1717 | handle_lure(self->mOtherParticipantUUID); | ||
1718 | } | ||
1697 | 1719 | ||
1698 | // static | 1720 | // static |
1699 | void LLFloaterIMPanel::onClickProfile( void* userdata ) | 1721 | void LLFloaterIMPanel::onClickProfile( void* userdata ) |