diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-11 12:18:47 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-11 12:18:47 -0700 |
| commit | 9df2e7e4cb11a3ca7fabc2a3c443564da18b9a13 (patch) | |
| tree | 29f0229aa5ad443ed36d56a2dca0102fd83c1447 /indra/newview/llviewermenu.h | |
| parent | 5a0025026cee93eb657290544b95eb00557ae5f1 (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); |