diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-28 16:53:12 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-28 16:53:12 +0200 |
| commit | 66ff81c8c16996773f9d66c5861e14df086a0e89 (patch) | |
| tree | 4413093fb5e209bc7a2e21c0d74e4a8cd6b9c2f0 /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | 2663bad36b4b02003b4b4c5989c2571c71504cd7 (diff) | |
| parent | a999e50a8ebb3ab641490294d67dbbd6eb0c8898 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 6678a3a460..c70d903fb0 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -130,12 +130,20 @@ void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id) { LLPanelChatControlPanel::setSessionId(session_id); - LLUUID avatar_id = LLIMModel::getInstance()->getOtherParticipantID(session_id); + LLIMModel& im_model = LLIMModel::instance(); + + LLUUID avatar_id = im_model.getOtherParticipantID(session_id); // Disable "Add friend" button for friends. childSetEnabled("add_friend_btn", !LLAvatarActions::isFriend(avatar_id)); - + getChild<LLAvatarIconCtrl>("avatar_icon")->setValue(avatar_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 ) + childSetEnabled("view_profile_btn", FALSE); } |