merge changes for DRTVWR-171

.hgtags

BuildParams

indra/llui/lltextbase.cpp

indra/llwindow/llkeyboard.cpp

indra/llwindow/llkeyboard.h

indra/llwindow/llkeyboardmacosx.cpp

indra/llwindow/llkeyboardsdl.cpp

indra/llwindow/llkeyboardwin32.cpp

indra/llxml/llcontrol.cpp

indra/llxml/llcontrol.h

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llagentaccess.cpp

indra/newview/llagentaccess.h

indra/newview/llfloaterland.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llnotificationhandlerutil.cpp

indra/newview/llstartup.cpp

indra/newview/lltoastnotifypanel.cpp