merge from remote repo

.hgignore

indra/cmake/DeploySharedLibs.cmake

indra/cmake/LLSharedLibs.cmake

indra/llui/llfloaterreg.cpp

indra/mac_crash_logger/CMakeLists.txt

indra/mac_updater/CMakeLists.txt

indra/media_plugins/example/media_plugin_example.cpp

indra/newview/app_settings/settings.xml

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llcallingcard.cpp

indra/newview/llfloaterbulkpermission.cpp

indra/newview/llfloaterbulkpermission.h

indra/newview/llfloaterdaycycle.cpp

indra/newview/llfloaterdaycycle.h

indra/newview/llfloaterenvsettings.cpp

indra/newview/llfloaterenvsettings.h

indra/newview/llfloaterhardwaresettings.cpp