diff options
Diffstat (limited to 'indra/newview/llconversationloglist.cpp')
| -rw-r--r-- | indra/newview/llconversationloglist.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp index e9c6df3ed8..c07f7cdfcb 100644 --- a/indra/newview/llconversationloglist.cpp +++ b/indra/newview/llconversationloglist.cpp @@ -26,6 +26,7 @@ #include "llviewerprecompiledheaders.h" #include "llavataractions.h" +#include "llchatservicehistory.h" #include "llagent.h" #include "llfloaterreg.h" #include "llfloaterconversationpreview.h" @@ -364,7 +365,8 @@ void LLConversationLogList::onCustomAction(const LLSD& userdata) } else if ("chat_history" == command_name) { - LLFloaterReg::showInstance("preview_conversation", selected_conversation_session_id, true); + if (!LLChatServiceHistory::historySuppressed()) + LLFloaterReg::showInstance("preview_conversation", selected_conversation_session_id, true); } else if ("offer_teleport" == command_name) { @@ -438,7 +440,7 @@ bool LLConversationLogList::isActionEnabled(const LLSD& userdata) } else if ("can_view_chat_history" == command_name) { - return true; + return !LLChatServiceHistory::historySuppressed(); } else if ("can_call" == command_name) { |