merge changes for DRTVWR-157

.hgtags

doc/contributions.txt

indra/llinventory/llparcel.h

indra/llmath/llmath.h

indra/newview/CMakeLists.txt

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfloatermodelpreview.h

indra/newview/llfloatermodelwizard.cpp

indra/newview/llfloatermodelwizard.h

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerobject.cpp

indra/newview/skins/default/xui/da/floater_model_wizard.xml

indra/newview/skins/default/xui/de/floater_model_wizard.xml

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

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

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

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