merge

.hgtags

autobuild.xml

indra/cmake/LLAddBuildTest.cmake

indra/cmake/LLCommon.cmake

indra/llcommon/CMakeLists.txt

indra/llcommon/llhandle.h

indra/llcommon/llstat.cpp

indra/llcommon/llstat.h

indra/llmessage/llregionflags.h

indra/llmessage/message_prehash.cpp

indra/llmessage/message_prehash.h

indra/llui/CMakeLists.txt

indra/newview/app_settings/cmd_line.xml

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llestateinfomodel.cpp

indra/newview/llestateinfomodel.h

indra/newview/llflexibleobject.cpp

indra/newview/llfloaterbuyland.cpp

indra/newview/llfloatergodtools.cpp