merge changes for storm-1673

indra/llmath/lloctree.h

indra/llui/lldockablefloater.cpp

indra/llui/lldockablefloater.h

indra/llui/lldockcontrol.cpp

indra/llui/lldockcontrol.h

indra/llui/llfloater.cpp

indra/llui/lltoolbar.cpp

indra/llui/lltoolbar.h

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_per_account.xml

indra/newview/llfavoritesbar.cpp

indra/newview/llfavoritesbar.h

indra/newview/llfloatertoybox.cpp

indra/newview/llfloatertoybox.h

indra/newview/llimfloatercontainer.cpp

indra/newview/llimfloatercontainer.h

indra/newview/llimview.cpp

indra/newview/llimview.h

indra/newview/llinventorymodel.cpp

indra/newview/llinventorymodel.h