merge

indra/llcharacter/llcharacter.cpp

indra/llui/llconsole.cpp

indra/llui/llconsole.h

indra/llui/lldockablefloater.cpp

indra/llui/lldockablefloater.h

indra/llui/llmultisliderctrl.cpp

indra/llui/llsearcheditor.cpp

indra/llui/lltabcontainer.cpp

indra/lscript/lscript_compile/lscript_tree.cpp

indra/lscript/lscript_compile/lscript_tree.h

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llagentui.cpp

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llappearancemgr.cpp

indra/newview/llcallfloater.cpp

indra/newview/llcallingcard.cpp

indra/newview/llchathistory.cpp