merge

.hgtags

BuildParams

doc/contributions.txt

indra/cmake/FindLLQtWebkit.cmake

indra/llprimitive/llmodel.cpp

indra/llprimitive/llmodel.h

indra/llprimitive/lltextureentry.cpp

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfloatermodelpreview.h

indra/newview/llmeshrepository.cpp

indra/newview/llmeshrepository.h

indra/newview/llstartup.cpp

indra/newview/lltexturecache.cpp

indra/newview/llviewerobjectlist.cpp

indra/newview/skins/default/xui/en/floater_model_preview.xml

indra/newview/viewer_manifest.py