aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llimpanel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llimpanel.cpp')
-rw-r--r--linden/indra/newview/llimpanel.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index a6693a3..5e260ec 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1247,6 +1247,7 @@ BOOL LLFloaterIMPanel::postBuild()
1247 childSetAction("end_call_btn", onClickEndCall, this); 1247 childSetAction("end_call_btn", onClickEndCall, this);
1248 childSetAction("send_btn", onClickSend, this); 1248 childSetAction("send_btn", onClickSend, this);
1249 childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this); 1249 childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
1250 childSetAction("offer_tp_btn", onClickOfferTeleport, this);
1250 1251
1251 childSetAction("moderator_kick_speaker", onKickSpeaker, this); 1252 childSetAction("moderator_kick_speaker", onKickSpeaker, this);
1252 //LLButton* close_btn = getChild<LLButton>("close_btn"); 1253 //LLButton* close_btn = getChild<LLButton>("close_btn");
@@ -1396,6 +1397,7 @@ void LLFloaterIMPanel::draw()
1396 childSetValue("mute_btn", LLMuteList::getInstance()->isMuted(mOtherParticipantUUID, LLMute::flagVoiceChat)); 1397 childSetValue("mute_btn", LLMuteList::getInstance()->isMuted(mOtherParticipantUUID, LLMute::flagVoiceChat));
1397 childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive()); 1398 childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive());
1398 } 1399 }
1400
1399 LLFloater::draw(); 1401 LLFloater::draw();
1400} 1402}
1401 1403
@@ -1732,6 +1734,13 @@ void LLFloaterIMPanel::onTabClick(void* userdata)
1732 self->setInputFocus(TRUE); 1734 self->setInputFocus(TRUE);
1733} 1735}
1734 1736
1737// static
1738void LLFloaterIMPanel::onClickOfferTeleport(void* userdata)
1739{
1740 LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
1741
1742 handle_lure(self->mOtherParticipantUUID);
1743}
1735 1744
1736// static 1745// static
1737void LLFloaterIMPanel::onClickProfile( void* userdata ) 1746void LLFloaterIMPanel::onClickProfile( void* userdata )