Merge branch 'master' into DRTVWR-486

indra/newview/VIEWER_VERSION.txt

indra/newview/llaudiosourcevo.cpp

indra/newview/llaudiosourcevo.h

indra/newview/llconversationview.cpp

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfloatermodelpreview.h

indra/newview/llfloatermodeluploadbase.h

indra/newview/llimprocessing.cpp

indra/newview/llinventorybridge.cpp

indra/newview/lllocationinputctrl.cpp

indra/newview/llmarketplacefunctions.cpp

indra/newview/llmarketplacefunctions.h

indra/newview/llmeshrepository.cpp

indra/newview/llnetmap.cpp

indra/newview/lloutputmonitorctrl.cpp

indra/newview/llpanellogin.cpp

indra/newview/llpanelvolume.cpp

indra/newview/llpreviewnotecard.cpp

indra/newview/llsnapshotlivepreview.cpp

indra/newview/lluploadfloaterobservers.h