svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

indra/llmath/v3dmath.h

indra/llui/llcheckboxctrl.cpp

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/llmenugl.cpp

indra/llui/llmenugl.h

indra/llui/llview.cpp

indra/llui/llview.h

indra/llwindow/llkeyboard.cpp

indra/llwindow/llkeyboard.h

indra/llwindow/llkeyboardwin32.cpp

indra/llwindow/llkeyboardwin32.h

indra/newview/app_settings/keys.ini

indra/newview/llchatbar.cpp

indra/newview/llfloatercolorpicker.cpp

indra/newview/llimpanel.cpp

indra/newview/llinventorymodel.cpp

indra/newview/llmanip.cpp

indra/newview/llpreview.cpp

indra/newview/lltexturectrl.cpp