Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2

.hgtags

BuildParams

build.sh

doc/contributions.txt

indra/cmake/TemplateCheck.cmake

indra/cmake/Variables.cmake

indra/llmath/v3math.cpp

indra/llmath/v3math.h

indra/llmessage/message.cpp

indra/llmessage/message_prehash.cpp

indra/llmessage/message_prehash.h

indra/llprimitive/llprimitive.cpp

indra/llprimitive/llprimitive.h

indra/llprimitive/llvolumemessage.cpp

indra/llprimitive/llvolumemessage.h

indra/llui/tests/llurlentry_stub.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/high_graphics.xml

indra/newview/app_settings/low_graphics.xml

indra/newview/app_settings/mid_graphics.xml