diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-10-28 20:16:13 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-10-28 20:16:13 +0200 |
| commit | e9c83f234306e070aa1f31eff68719589265f916 (patch) | |
| tree | 06ae45597b71fa10e061e51423c8f9f486b86dc8 /indra/newview/llimview.cpp | |
| parent | e8e5dfeb369d13509bd7631230373dda0c3c7b6a (diff) | |
| parent | d01f7a7422d3db38b2cd6370a03cfd10bb0d53e0 (diff) | |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 6af6ff8705..8a55ab41b9 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -148,7 +148,7 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string& mSessionInitialized(false), mCallBackEnabled(true), mTextIMPossible(true), - mProfileButtonEnabled(true) + mOtherParticipantIsAvatar(true) { if (IM_NOTHING_SPECIAL == type || IM_SESSION_P2P_INVITE == type) { @@ -177,7 +177,7 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string& { mCallBackEnabled = LLVoiceClient::getInstance()->isSessionCallBackPossible(mSessionID); mTextIMPossible = LLVoiceClient::getInstance()->isSessionTextIMPossible(mSessionID); - mProfileButtonEnabled = LLVoiceClient::getInstance()->isParticipantAvatar(mSessionID); + mOtherParticipantIsAvatar = LLVoiceClient::getInstance()->isParticipantAvatar(mSessionID); } } |