diff options
| author | Eugene Mutavchi <emutavchi@productengine.com> | 2009-10-28 18:44:31 +0200 |
|---|---|---|
| committer | Eugene Mutavchi <emutavchi@productengine.com> | 2009-10-28 18:44:31 +0200 |
| commit | 4ca9e28f91446c2da413cc1089105278b60c8453 (patch) | |
| tree | 946a43ada2957a1a3c96b42a993f740ce0ed5f00 /indra/newview | |
| parent | 86921724c438e31957bc803695054bba80645df4 (diff) | |
No ticket, just renamed mProfileButtonEnabled to mOtherParticipantIsAvatar
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llimview.h | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index b429ae8cf4..a2b6ef6aa5 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); } } diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 8c2ca149a6..ae8fd355ea 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -76,7 +76,7 @@ public: bool mCallBackEnabled; bool mTextIMPossible; - bool mProfileButtonEnabled; + bool mOtherParticipantIsAvatar; }; diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index c70d903fb0..5b589d6de6 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -142,7 +142,7 @@ void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id) // Disable profile button if participant is not realy SL avatar LLIMModel::LLIMSession* im_session = im_model.findIMSession(session_id); - if( im_session && !im_session->mProfileButtonEnabled ) + if( im_session && !im_session->mOtherParticipantIsAvatar ) childSetEnabled("view_profile_btn", FALSE); } |