merge

indra/llcommon/llfasttimer.h

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llmessage/llhttpclient.cpp

indra/llmessage/llurlrequest.cpp

indra/llrender/llimagegl.cpp

indra/llui/llfloater.cpp

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llchiclet.cpp

indra/newview/llcompilequeue.cpp

indra/newview/llfloaterchat.cpp

indra/newview/llfloaterchat.h

indra/newview/llimview.cpp

indra/newview/lllandmarklist.cpp

indra/newview/llpanelclassified.cpp

indra/newview/llpanelclassified.h

indra/newview/llpanellandmarkinfo.cpp