merge with head

indra/llui/lldockcontrol.cpp

indra/newview/CMakeLists.txt

indra/newview/llagent.cpp

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llchatbar.cpp

indra/newview/llchiclet.cpp

indra/newview/llchicletbar.cpp

indra/newview/llchicletbar.h

indra/newview/llfloatersounddevices.cpp

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llimpanel.cpp

indra/newview/llimview.cpp

indra/newview/llimview.h

indra/newview/llnearbychathandler.cpp

indra/newview/llscriptfloater.cpp

indra/newview/llscriptfloater.h

indra/newview/llspeakbutton.cpp

indra/newview/llspeakbutton.h