Merge

.hgtags

BuildParams

doc/contributions.txt

indra/llcommon/llsdserialize.cpp

indra/llprimitive/llmodel.cpp

indra/llprimitive/llmodel.h

indra/newview/app_settings/ignorable_dialogs.xml

indra/newview/app_settings/settings.xml

indra/newview/llbottomtray.cpp

indra/newview/llcallfloater.cpp

indra/newview/llfirstuse.cpp

indra/newview/llfirstuse.h

indra/newview/llfloaterbeacons.cpp

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfriendcard.cpp

indra/newview/llmeshrepository.cpp

indra/newview/llmeshrepository.h

indra/newview/llselectmgr.cpp

indra/newview/llselectmgr.h

indra/newview/llsidetray.cpp