diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-06-16 14:42:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-06-16 14:42:31 -0400 |
| commit | fa1913ea679fd895d709da5c5782b26c7d03a40a (patch) | |
| tree | 83250b59c556bfc4227d38ba12c2dac242642a2d /indra/newview/llimview.cpp | |
| parent | e0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff) | |
| parent | ee05fe0e5f8d73ce4db41239fae3bfe691e54db5 (diff) | |
merge changes for STORM-2109
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 5d3a11e245..008388c244 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1262,12 +1262,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) { |