merge

indra/llui/llcombobox.cpp

indra/llui/llcombobox.h

indra/newview/llagent.cpp

indra/newview/llfloateruipreview.cpp

indra/newview/llnavigationbar.cpp

indra/newview/llpanelplaces.cpp

indra/newview/llsearchcombobox.cpp

indra/newview/lltexturecache.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvoavatarself.cpp

indra/newview/llvoavatarself.h

indra/newview/llvoicechannel.cpp

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

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

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

indra/newview/viewer_manifest.py