merge

indra/linux_crash_logger/CMakeLists.txt

indra/linux_updater/CMakeLists.txt

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

indra/newview/llcallfloater.h

indra/newview/llchathistory.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloatertools.cpp

indra/newview/llimfloatercontainer.cpp

indra/newview/lllogchat.cpp

indra/newview/llnearbychathandler.cpp

indra/newview/llnotificationhandlerutil.cpp

indra/newview/llpanelnearbymedia.cpp

indra/newview/llpanelobjectinventory.cpp

indra/newview/llscreenchannel.cpp

indra/newview/llsidetray.cpp

indra/newview/llstartup.cpp