Merge branch 'master' into DRTVWR-516-maint

autobuild.xml

indra/llcommon/CMakeLists.txt

indra/llcommon/indra_constants.h

indra/llcommon/llkeybind.cpp

indra/llcommon/llkeybind.h

indra/llprimitive/llmodel.cpp

indra/llui/llmenugl.cpp

indra/llui/llmenugl.h

indra/llui/llscrolllistcell.cpp

indra/llui/llscrolllistcell.h

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llui/llscrolllistitem.cpp

indra/llui/llscrolllistitem.h

indra/llwindow/llkeyboard.cpp

indra/llwindow/llkeyboard.h

indra/llwindow/llmousehandler.cpp

indra/llwindow/llmousehandler.h

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt