diff options
author | Rider Linden <rider@lindenlab.com> | 2015-11-23 13:04:01 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-11-23 13:04:01 -0800 |
commit | 5d897443a9e50843ac562da8972bfe2f9f8f1129 (patch) | |
tree | 8355dfbbbab67182a9fc21f1ae7bb0d1ea5896c0 /indra/newview/llimview.cpp | |
parent | 2af14639de9f575ac9a2766835206e5c6ffb46c8 (diff) | |
parent | 43253a36ec382249249e2dcf7b562af0dfb6fd84 (diff) |
Merge from Vivox Repo
Diffstat (limited to 'indra/newview/llimview.cpp')
-rwxr-xr-x | indra/newview/llimview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 53b97a58c5..951389b856 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1388,12 +1388,12 @@ void LLIMModel::sendMessage(const std::string& utf8_text, info = LLAvatarTracker::instance().getBuddyInfo(other_participant_id); U8 offline = (!info || info->isOnline()) ? IM_ONLINE : IM_OFFLINE; - - if((offline == IM_OFFLINE) && (LLVoiceClient::getInstance()->isOnlineSIP(other_participant_id))) - { - // User is online through the OOW connector, but not with a regular viewer. Try to send the message via SLVoice. - sent = LLVoiceClient::getInstance()->sendTextMessage(other_participant_id, utf8_text); - } + // Old call to send messages to SLim client, no longer supported. + //if((offline == IM_OFFLINE) && (LLVoiceClient::getInstance()->isOnlineSIP(other_participant_id))) + //{ + // // User is online through the OOW connector, but not with a regular viewer. Try to send the message via SLVoice. + // sent = LLVoiceClient::getInstance()->sendTextMessage(other_participant_id, utf8_text); + //} if(!sent) { |