diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-10-27 18:01:41 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-10-27 18:01:41 +0200 |
| commit | 3eb7f84b10832d77d8765ea9550108c67c462bcb (patch) | |
| tree | be0c065fa612d29cc1117f9eccd05a7560f405d4 /indra/newview/llimview.cpp | |
| parent | 4309277c1bd063327cbd0cb1c9f3e276301d9fb7 (diff) | |
IM: implemented task EXT-1905 (Add "Call" and "End Call" functionality to new IIM Floater)
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 164da4136f..8792713423 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -145,7 +145,8 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string& mInitialTargetIDs(ids), mVoiceChannel(NULL), mSpeakers(NULL), - mSessionInitialized(false) + mSessionInitialized(false), + mCallBackEnabled(true) { if (IM_NOTHING_SPECIAL == type || IM_SESSION_P2P_INVITE == type) { @@ -169,6 +170,11 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string& //so we're already initialized mSessionInitialized = true; } + + if (IM_NOTHING_SPECIAL == type) + { + mCallBackEnabled = LLVoiceClient::getInstance()->isSessionCallBackPossible(mSessionID); + } } LLIMModel::LLIMSession::~LLIMSession() |