Merge

indra/newview/llchathistory.cpp

indra/newview/llpanelgroupgeneral.cpp

indra/newview/llpanellogin.cpp

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

indra/newview/skins/default/xui/en/floater_sell_land.xml

indra/newview/skins/default/xui/en/panel_group_general.xml

indra/newview/skins/default/xui/en/panel_landmarks.xml

indra/newview/skins/default/xui/en/panel_main_inventory.xml

.../newview/skins/default/xui/en/panel_outfits_inventory.xml

indra/newview/skins/default/xui/en/panel_people.xml

indra/newview/skins/default/xui/en/panel_places.xml

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

indra/newview/skins/default/xui/en/sidepanel_item_info.xml

indra/newview/viewer_manifest.py