hg merge

.hgtags

autobuild.xml

doc/contributions.txt

indra/llcharacter/llbvhloader.cpp

indra/llcommon/indra_constants.h

indra/llcommon/llversionviewer.h

indra/llmath/tests/llbbox_test.cpp

indra/llmessage/llassetstorage.cpp

indra/llui/lltexteditor.cpp

indra/llvfs/lldir_linux.cpp

indra/llvfs/lldir_mac.cpp

indra/newview/llagent.cpp

indra/newview/llfloaterchat.cpp

indra/newview/llfloaterworldmap.cpp

indra/newview/llfolderview.cpp

indra/newview/llfolderview.h

indra/newview/llfolderviewitem.cpp

indra/newview/llgesturemgr.cpp

indra/newview/llgesturemgr.h

indra/newview/llhudeffectlookat.cpp