diff options
| author | Cho <cho@lindenlab.com> | 2013-02-25 18:11:51 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-02-25 18:11:51 +0000 |
| commit | cbbf1504f015f42e3426a92129824e05021e1fe3 (patch) | |
| tree | 4922b33e421f7c1184330f62793f6f9519e149de /indra/newview/llpanelpeople.cpp | |
| parent | 6194302a849431e84c046325d3cd19e92f62aa6f (diff) | |
| parent | 4b6e1c26f05d89aa130a899803553940069457c0 (diff) | |
merging
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 6667706333..c5283404f1 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -812,19 +812,20 @@ void LLPanelPeople::updateButtons() else { bool is_friend = true; - + bool is_self = false; // Check whether selected avatar is our friend. if (item_selected) { selected_id = selected_uuids.front(); is_friend = LLAvatarTracker::instance().getBuddyInfo(selected_id) != NULL; + is_self = gAgent.getID() == selected_id; } LLPanel* cur_panel = mTabContainer->getCurrentPanel(); if (cur_panel) { if (cur_panel->hasChild("add_friend_btn", TRUE)) - cur_panel->getChildView("add_friend_btn")->setEnabled(item_selected && !is_friend); + cur_panel->getChildView("add_friend_btn")->setEnabled(item_selected && !is_friend && !is_self); if (friends_tab_active) { |