livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge.

master
Nicky 2013-07-11 00:37:49 +02:00
parent 9dc9cbdb49 8696410d79
commit 5dc1d38b1c
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/nd/ndexception_handler_stub.h
View File

@ -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 )
{ }

7
indra/newview/skins/default/xui/en/menu_people_nearby.xml
View File

@ -135,11 +135,4 @@
parameter="can_block" />
</menu_item_check>
<menu_item_separator />
<menu_item_call
label="Invite To Group"
name="GroupInvite">
<menu_item_call.on_click
function="Avatar.GroupInvite" />
</menu_item_call>
</context_menu>