merge

.hgtags

indra/llprimitive/llmodel.cpp

indra/newview/app_settings/settings.xml

indra/newview/llagentcamera.cpp

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfloaterregioninfo.cpp

indra/newview/llfloatersearch.cpp

indra/newview/llpanelobject.cpp

indra/newview/llpanelobject.h

indra/newview/llpanelvolume.cpp

indra/newview/llpanelvolume.h

indra/newview/llselectmgr.cpp

indra/newview/llviewerobject.cpp

indra/newview/llviewerobject.h

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/floater_tools.xml

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

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