Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild

indra/cmake/WebKitLibPlugin.cmake

indra/llimage/llimage.cpp

indra/newview/llfloaterworldmap.cpp

indra/newview/lltexlayer.cpp

indra/newview/lltexlayer.h

indra/newview/lltoastalertpanel.cpp

indra/newview/lltoastalertpanel.h

indra/newview/lltracker.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewermessage.h

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvoavatarself.cpp

indra/newview/llvovolume.cpp

indra/newview/llvowlsky.cpp

indra/newview/llweb.cpp

indra/newview/llworldmapview.cpp

indra/newview/pipeline.cpp

indra/newview/skins/default/xui/en/notifications.xml