merge

indra/newview/llagent.cpp

indra/newview/llappviewer.cpp

indra/newview/llchannelmanager.cpp

indra/newview/lldebugview.cpp

indra/newview/lldrawable.cpp

indra/newview/lldynamictexture.cpp

indra/newview/llface.cpp

indra/newview/llfasttimerview.cpp

indra/newview/llfloaterauction.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterproperties.cpp

indra/newview/llfloatersnapshot.cpp

indra/newview/llfolderview.cpp

indra/newview/llhudicon.cpp

indra/newview/llhudrender.cpp

indra/newview/llhudtext.cpp

indra/newview/llimfloater.cpp

indra/newview/llimhandler.cpp

indra/newview/llmanip.cpp

indra/newview/llmaniprotate.cpp