merge

build.sh

doc/contributions.txt

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llmath/tests/m3math_test.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_xp.txt

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llavataractions.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llfloaterworldmap.cpp

indra/newview/llfloaterworldmap.h

indra/newview/llinventorypanel.cpp

indra/newview/llpanelavatar.cpp