Merge.

.hgtags

doc/contributions.txt

indra/llcommon/llsdserialize.cpp

indra/llcommon/llsdserialize_xml.cpp

indra/llcommon/llsys.cpp

indra/llcommon/llversionviewer.h

indra/llinventory/llinventory.cpp

indra/llplugin/llpluginprocesschild.cpp

indra/llplugin/llpluginprocessparent.cpp

indra/llrender/llfontgl.cpp

indra/llui/llmenubutton.cpp

indra/llui/llmenubutton.h

indra/llui/llurlentry.cpp

indra/llui/llview.cpp

indra/newview/app_settings/settings.xml

indra/newview/llavataractions.cpp

indra/newview/llfeaturemanager.cpp

indra/newview/llfloatersearch.cpp

indra/newview/llfloaterworldmap.cpp

indra/newview/llfloaterworldmap.h