merge storm-206

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/skins/default/textures/ff_edit_mine.tga

indra/newview/skins/default/textures/ff_edit_mine_button.tga

indra/newview/skins/default/textures/ff_edit_theirs.tga

.../newview/skins/default/textures/ff_edit_theirs_button.tga

...ewview/skins/default/textures/ff_online_status_button.tga

indra/newview/skins/default/textures/ff_visible_map.tga

.../newview/skins/default/textures/ff_visible_map_button.tga

indra/newview/skins/default/textures/ff_visible_online.tga

...wview/skins/default/textures/ff_visible_online_button.tga

indra/newview/skins/default/textures/icons/edit_mine.png

indra/newview/skins/default/textures/icons/edit_theirs.png

indra/newview/skins/default/textures/icons/see_me_online.png

indra/newview/skins/default/textures/icons/see_on_map.png

indra/newview/skins/default/textures/textures.xml

...a/newview/skins/default/xui/en/panel_avatar_list_item.xml