diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-11 16:55:34 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-11 16:55:34 -0400 |
commit | 47093f6e52741f36fcc782cb52e54baf9f6e3acf (patch) | |
tree | 86b5d6fe9cd8dfbd5a9e36dab09c71f9de099cb3 /indra/newview/llviewermenu.h | |
parent | d822d0e96bb69374f49fef8a827a042474deda8d (diff) | |
parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermenu.h')
-rwxr-xr-x | indra/newview/llviewermenu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index 7f09fc2d8f..b7bdf00157 100755 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -83,6 +83,7 @@ BOOL enable_god_full(void* user_data); BOOL enable_god_liaison(void* user_data); BOOL enable_god_basic(void* user_data); void set_underclothes_menu_options(); +void check_merchant_status(); void exchange_callingcard(const LLUUID& dest_id); |