From 2c3254431c97fa9e4efa967fbc3cb6abbffa55d2 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 10 Jul 2013 22:31:15 +0200 Subject: [PATCH 1/2] Fix breakpad stub for Mac. --- indra/llcommon/nd/ndexception_handler_stub.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) { } From 8696410d79f2d1c75f26ec350da60f5bbd0a633f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 10 Jul 2013 22:51:40 +0200 Subject: [PATCH 2/2] Remove duplicated "Invite to Group" entry in menu_people_nearby.xml --- indra/newview/skins/default/xui/en/menu_people_nearby.xml | 7 ------- 1 file changed, 7 deletions(-) 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" /> - - - -