Automated merge with http://10.1.4.28:8000/

indra/llcharacter/llkeyframemotion.cpp

indra/llcommon/llapr.cpp

indra/llcommon/lldate.cpp

indra/llcommon/llstring.cpp

indra/llcommon/llversionviewer.h

indra/llimage/llimage.cpp

indra/llui/llmenugl.cpp

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llui/lluictrl.cpp

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llcofwearables.cpp

indra/newview/llfloatermediabrowser.cpp

indra/newview/llfloatermediabrowser.h

indra/newview/llfolderview.cpp

indra/newview/llfolderview.h

indra/newview/llinventorybridge.cpp