merge changes for vmrg-226

doc/contributions.txt

indra/newview/CMakeLists.txt

indra/newview/llfilepicker.cpp

indra/newview/llfloaterbvhpreview.cpp

indra/newview/llfloaterbvhpreview.h

indra/newview/llfloaternamedesc.cpp

indra/newview/llfloaternamedesc.h

indra/newview/llimview.cpp

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewermenufile.cpp

indra/newview/llviewermessage.cpp

indra/newview/skins/default/colors.xml

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

...w/skins/default/xui/en/floater_animation_anim_preview.xml

...ew/skins/default/xui/en/floater_animation_bvh_preview.xml

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

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

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

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

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