diff options
author | Jacek Antonelli | 2008-09-22 23:09:56 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-22 23:09:56 -0500 |
commit | 86de3e0dd2a8db0783f40139fcdb0ffc642d032f (patch) | |
tree | 2fd0ad665bdc920b438d23112d1cf154604e587e /linden | |
parent | Merge branch 'VWR-8341' into next-merge (diff) | |
download | meta-impy-86de3e0dd2a8db0783f40139fcdb0ffc642d032f.zip meta-impy-86de3e0dd2a8db0783f40139fcdb0ffc642d032f.tar.gz meta-impy-86de3e0dd2a8db0783f40139fcdb0ffc642d032f.tar.bz2 meta-impy-86de3e0dd2a8db0783f40139fcdb0ffc642d032f.tar.xz |
'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.
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/llimpanel.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
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() | |||
1397 | childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive()); | 1397 | childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive()); |
1398 | } | 1398 | } |
1399 | 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 | |||
1413 | LLFloater::draw(); | 1400 | LLFloater::draw(); |
1414 | } | 1401 | } |
1415 | 1402 | ||