merge changes for callum fixes and workarounds

XCODE_6_UPGRADES_TODO.txt

autobuild.xml

indra/cmake/00-Common.cmake

indra/cmake/Havok.cmake

indra/cmake/JsonCpp.cmake

indra/cmake/Variables.cmake

indra/llappearance/lltexturemanagerbridge.h

indra/llappearance/llwearable.h

indra/llappearance/llwearabledata.cpp

indra/llappearance/llwearabletype.h

indra/llaudio/llaudiodecodemgr.cpp

indra/llcharacter/lleditingmotion.cpp

indra/llcharacter/llheadrotmotion.cpp

indra/llcharacter/llkeyframemotion.cpp

indra/llcharacter/llkeyframewalkmotion.cpp

indra/llcharacter/lltargetingmotion.cpp

indra/llcommon/llfile.cpp

indra/llcommon/llfile.h

indra/llcommon/llframetimer.cpp

indra/llcommon/llinitparam.h