merge

indra/llui/lldockablefloater.cpp

indra/llui/lldockablefloater.h

indra/llui/lldockcontrol.cpp

indra/llui/lldockcontrol.h

indra/llui/lllayoutstack.cpp

indra/llui/lllayoutstack.h

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llchathistory.cpp

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llfloatergesture.cpp

indra/newview/llfloatergesture.h

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llinspectavatar.cpp

indra/newview/lljoystickbutton.cpp

indra/newview/llmoveview.cpp

indra/newview/llmoveview.h

indra/newview/llnearbychat.cpp

indra/newview/llnearbychat.h