Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into master

doc/contributions.txt

indra/edit-me-to-trigger-new-build.txt

indra/llappearance/llavatarjoint.cpp

indra/llcommon/llapr.h

indra/llcommon/llfasttimer.cpp

indra/llcommon/llfasttimer.h

indra/llcommon/llmemory.cpp

indra/llcommon/llmemory.h

indra/llcommon/llpreprocessor.h

indra/llcommon/llsdutil.cpp

indra/llcommon/llstring.h

indra/llcommon/llsys.cpp

indra/llcommon/llthread.cpp

indra/llcommon/lltimer.cpp

indra/llcommon/lltimer.h

indra/llcommon/lluuid.cpp

indra/llcommon/stdtypes.h

indra/llfilesystem/lldir.cpp

indra/llfilesystem/lldir.h

indra/llfilesystem/lldir_solaris.cpp