Merge

.hgtags

autobuild.xml

indra/cmake/Copy3rdPartyLibs.cmake

indra/llplugin/slplugin/slplugin-objc.mm

indra/llvfs/lldir_mac.cpp

indra/llvfs/llvfs_objc.mm

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/llface.cpp

indra/newview/llgesturemgr.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llvoiceclient.cpp

indra/newview/llvoiceclient.h

indra/newview/llvoicevivox.cpp

indra/newview/llvoicevivox.h

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

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

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

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

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