merge

indra/llprimitive/llmodel.h

indra/newview/CMakeLists.txt

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfloaterobjectweights.cpp

indra/newview/llfloaterobjectweights.h

indra/newview/llfloaterregioninfo.cpp

indra/newview/llfloaterregioninfo.h

indra/newview/llfloatertools.cpp

indra/newview/llmeshrepository.cpp

indra/newview/llviewerfloaterreg.cpp

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

...a/newview/skins/default/xui/en/floater_object_weights.xml

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

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