fixed merge

indra/llui/lllayoutstack.cpp

indra/newview/llagentui.h

indra/newview/llappviewer.cpp

indra/newview/llbottomtray.h

indra/newview/llbrowsernotification.cpp

indra/newview/llimhandler.cpp

indra/newview/llnearbychathandler.cpp

indra/newview/llnotificationalerthandler.cpp

indra/newview/llnotificationgrouphandler.cpp

indra/newview/llnotificationhandler.h

indra/newview/llnotificationhandlerutil.cpp

indra/newview/llnotificationofferhandler.cpp

indra/newview/llnotificationscripthandler.cpp

indra/newview/llnotificationtiphandler.cpp

indra/newview/llsyswellwindow.cpp

indra/newview/llviewermessage.cpp