Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010

.hgtags

BuildParams

autobuild.xml

build.sh

doc/contributions.txt

indra/CMakeLists.txt

indra/cmake/GoogleMock.cmake

indra/cmake/LLAddBuildTest.cmake

indra/cmake/run_build_test.py

indra/copy_win_scripts/start-client.py

indra/lib/python/indra/util/llperformance.py

indra/lib/python/indra/util/simperf_proc_interface.py

indra/lib/python/indra/util/test_win32_manifest.py

indra/llcharacter/llanimationstates.cpp

indra/llcommon/llavatarconstants.h

indra/llcommon/lllslconstants.h

indra/llcommon/llmemory.cpp

indra/llcommon/llmemory.h

indra/llcommon/llmemtype.cpp

indra/llcommon/llmetricperformancetester.h