From 86de3e0dd2a8db0783f40139fcdb0ffc642d032f Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 22 Sep 2008 23:09:56 -0500 Subject: 'Offer Teleport' button in IM panel is now always enabled, regardless of whether the other person is known to be online. Fixes crash introduced by VWR-2072 when IMing someone not on your friends list, and makes the feature useful in more cases. --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llimpanel.cpp | 13 ------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7d3b0d3..cd8db83 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,11 @@ 2008-09-22 Jacek Antonelli + * linden/indra/newview/llimpanel.cpp: + 'Offer Teleport' button in IM panel is now always enabled, + regardless of whether the other person is known to be online. + Fixes crash introduced by VWR-2072 when IMing someone not on + your friends list, and makes the feature useful in more cases. + * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml: Increased maximum settable transparency from 90% to 100%. diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index 46a64d4..b4afa34 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp @@ -1397,19 +1397,6 @@ void LLFloaterIMPanel::draw() childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive()); } - // enable 'offer teleport' button - if(mDialog == IM_NOTHING_SPECIAL) - { - const LLRelationship* info = NULL; - info = LLAvatarTracker::instance().getBuddyInfo(mOtherParticipantUUID); - childSetEnabled("offer_tp_btn", info->isOnline()); - } - else - { - childSetEnabled("offer_tp_btn", false); - childSetVisible("offer_tp_button", false); - } - LLFloater::draw(); } -- cgit v1.1