diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-20 18:32:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-20 18:32:29 -0400 |
| commit | e6b7a7e2f6a5175dd6c3e1d8d8c8f8c0e737a030 (patch) | |
| tree | 1fc66c532666cdd061ec12e10b99bcb3be00d64e /indra/newview/llconversationloglist.cpp | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
| parent | 2d19d78846ccbd8993c468cc27b8db7f0b93b235 (diff) | |
merge changes for DRTVWR-303
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()); } |