diff options
author | Oz Linden <oz@lindenlab.com> | 2015-10-13 09:49:57 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-10-13 09:49:57 -0400 |
commit | 90c26759ef5fe1f35bcda82f444e647d07c28fc6 (patch) | |
tree | 5f0d669d275be58fa7543cb1a826b3036c031c13 /indra/newview/llconversationmodel.cpp | |
parent | 4d81570d62bc9d746565083ef18fdc16c198a5dc (diff) | |
parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) |
merge changes for 3.8.5-release
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
-rwxr-xr-x | indra/newview/llconversationmodel.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 6e32ce60ec..328a638f2f 100755 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -136,7 +136,24 @@ void LLConversationItem::buildParticipantMenuOptions(menuentry_vec_t& items, U32 items.push_back(std::string("im")); items.push_back(std::string("offer_teleport")); items.push_back(std::string("request_teleport")); - items.push_back(std::string("voice_call")); + + if (getType() != CONV_SESSION_1_ON_1) + { + items.push_back(std::string("voice_call")); + } + else + { + LLVoiceChannel* voice_channel = LLIMModel::getInstance() ? LLIMModel::getInstance()->getVoiceChannel(this->getUUID()) : NULL; + if(voice_channel != LLVoiceChannel::getCurrentVoiceChannel()) + { + items.push_back(std::string("voice_call")); + } + else + { + items.push_back(std::string("disconnect_from_voice")); + } + } + items.push_back(std::string("chat_history")); items.push_back(std::string("separator_chat_history")); items.push_back(std::string("add_friend")); |