merge

.hgtags

indra/newview/llviewerobject.cpp

indra/newview/llviewerobject.h

indra/newview/llvovolume.cpp

indra/newview/llvovolume.h

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

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

...ewview/skins/default/xui/de/floater_animation_preview.xml

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

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

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

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

...w/skins/default/xui/de/floater_pathfinding_characters.xml

...view/skins/default/xui/de/floater_pathfinding_console.xml

...iew/skins/default/xui/de/floater_pathfinding_linksets.xml

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

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

...ewview/skins/default/xui/de/floater_spellcheck_import.xml

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

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