diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-25 09:53:47 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-25 09:53:47 -0800 |
| commit | c3377625fd31f0381143f3f52f33325702b6c74d (patch) | |
| tree | 4d81427b0ab0825da25b5a8b6c18e55d2e63ac2b | |
| parent | 33380b2fd9ab66d4cbe062f0a56cc655c18368f8 (diff) | |
| parent | fbf7217b49101faad3a4e910d8c88150c39e73d6 (diff) | |
merge
| -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) { |