diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-05 13:29:32 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-05 13:29:32 -0800 |
| commit | e26dacb374ec0fd87679aa730cf937a44bab3628 (patch) | |
| tree | 12800e6f335a00ac7b2e12befeddfab69f18be0c /indra | |
| parent | 98229cbbcf780a916474bdd789a8437461bcaa3b (diff) | |
| parent | 02608052592eb47aea7c8856e85d64aec086d658 (diff) | |
Merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index c8bb3d5353..65a7b5322b 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -992,9 +992,6 @@ void LLPanelPeople::onFriendsViewSortMenuItemClicked(const LLSD& userdata) mAllFriendList->toggleIcons(); mOnlineFriendList->toggleIcons(); } - else if (chosen_item == "organize_offline") - { - } } void LLPanelPeople::onGroupsViewSortMenuItemClicked(const LLSD& userdata) diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml index eedb4383bb..f1117d1419 100644 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -31,9 +31,6 @@ function="CheckControl" parameter="FriendsListShowIcons" /> </menu_item_check> - <menu_item_call name="organize_offline" label="Organize Offline Friends"> - <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="organize_offline" /> - </menu_item_call> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" /> |