merge

indra/newview/llfloatercamera.cpp

indra/newview/llfloatercamera.h

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llviewerregion.cpp

indra/newview/skins/default/xui/de/floater_avatar_picker.xml

indra/newview/skins/default/xui/de/floater_bulk_perms.xml

indra/newview/skins/default/xui/de/floater_tools.xml

...wview/skins/default/xui/de/panel_preferences_advanced.xml

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

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

...ewview/skins/default/xui/en/panel_preferences_general.xml

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

indra/newview/skins/default/xui/ja/floater_im_container.xml

indra/newview/skins/default/xui/ja/floater_snapshot.xml

indra/newview/skins/default/xui/ja/floater_sys_well.xml

indra/newview/skins/default/xui/ja/menu_object.xml

indra/newview/skins/default/xui/ja/teleport_strings.xml

install.xml