merge

indra/llimage/CMakeLists.txt

indra/llimage/llimagedimensionsinfo.cpp

indra/llimage/llimagedimensionsinfo.h

indra/newview/app_settings/settings.xml

indra/newview/llchiclet.cpp

indra/newview/llchiclet.h

indra/newview/llfloaterimagepreview.cpp

indra/newview/llfloaterimagepreview.h

indra/newview/llnearbychat.cpp

indra/newview/llnearbychat.h

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

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

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

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