diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-04-23 07:23:10 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-04-23 07:23:10 -0700 |
| commit | 54de43834c8b89e88db26441e5fe191547fb9e62 (patch) | |
| tree | 9ac5911e9821c1ab6f69731c83faee07f539d52e /indra/newview/llconversationmodel.cpp | |
| parent | 244734647c38f256ace2d64fde4d3149d37e0e25 (diff) | |
| parent | 25c222e31770cb2c10e262b02ae9065521986349 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index c74ce24872..6e95df8383 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -386,6 +386,10 @@ void LLConversationItemSession::buildContextMenu(LLMenuGL& menu, U32 flags) addVoiceOptions(items); items.push_back(std::string("chat_history")); } + else if(this->getType() == CONV_SESSION_NEARBY) + { + items.push_back(std::string("chat_history")); + } hide_context_entries(menu, items, disabled_items); } |