diff --git a/indra/llcommon/nd/ndexception_handler_stub.h b/indra/llcommon/nd/ndexception_handler_stub.h index 3508a4c40d..8cf6e69f86 100644 --- a/indra/llcommon/nd/ndexception_handler_stub.h +++ b/indra/llcommon/nd/ndexception_handler_stub.h @@ -46,7 +46,7 @@ namespace google_breakpad class ExceptionHandler { public: - ExceptionHandler( std::string const&, int, tDumpFunc, int, bool ) + ExceptionHandler( std::string const&, int, tDumpFunc, int, bool, int ) { } ExceptionHandler( MinidumpDescriptor const&, int, tDumpFunc2, int, bool, int ) { } diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index 7892bc5e96..3abb5f7bc8 100755 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -135,11 +135,4 @@ parameter="can_block" /> - - - -