diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-14 19:12:38 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-14 19:12:38 +0200 |
| commit | 5b4746701bcacd0562fc7876f4b6db652ccfcb3b (patch) | |
| tree | 85ee66681c62b2efe2b59287590a57a8fa94dd9b /indra/newview/llconversationloglist.cpp | |
| parent | 3ee18d8b29caa612ee7656aa1ac69e3c1edce4cc (diff) | |
| parent | b6d973d31380e7d35f7ed014d682dfc5f2465afe (diff) | |
merging
Diffstat (limited to 'indra/newview/llconversationloglist.cpp')
| -rw-r--r-- | indra/newview/llconversationloglist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp index b202cfc9d3..5ab108b39f 100644 --- a/indra/newview/llconversationloglist.cpp +++ b/indra/newview/llconversationloglist.cpp @@ -390,7 +390,7 @@ bool LLConversationLogList::isActionEnabled(const LLSD& userdata) { return is_p2p && LLAvatarActions::canOfferTeleport(selected_id); } - else if ("can_show_on_map") + else if ("can_show_on_map" == command_name) { return is_p2p && ((LLAvatarTracker::instance().isBuddyOnline(selected_id) && is_agent_mappable(selected_id)) || gAgent.isGodlike()); } |