diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-06-22 13:50:51 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-06-22 13:50:51 -0700 |
| commit | d5a9821d526f1da465ff4fd533893b127a350d85 (patch) | |
| tree | 17e6897af85ae98c4c2002c44e2c4887f9262e16 /indra/newview/llviewermenu.h | |
| parent | 855ba82806893f21e44442209865a691ee1b8938 (diff) | |
| parent | 0a9f25bcfbc977cf894e83fda95d7ff693039923 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermenu.h')
| -rw-r--r-- | indra/newview/llviewermenu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index b7bdf00157..2f9bf7f714 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -83,7 +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 check_merchant_status(bool force = false); void exchange_callingcard(const LLUUID& dest_id); |