Merge

BuildParams

doc/contributions.txt

indra/llaudio/llaudioengine.cpp

indra/newview/llagent.cpp

indra/newview/llfloaterpostcard.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llfloatersnapshot.cpp

indra/newview/llsidetray.cpp

indra/newview/llsidetray.h

indra/newview/llviewermenufile.cpp

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

indra/newview/skins/default/xui/da/floater_bumps.xml

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

indra/newview/skins/default/xui/da/floater_display_name.xml

indra/newview/skins/default/xui/da/floater_event.xml

indra/newview/skins/default/xui/da/floater_incoming_call.xml

indra/newview/skins/default/xui/da/floater_pay.xml

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

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