From 0a9f25bcfbc977cf894e83fda95d7ff693039923 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 22 Jun 2016 13:35:13 -0700 Subject: MAINT-6385: Ensure that VMM initialization only happens once after login and that it will only happen after the region caps have been received. --- indra/newview/llviewermenu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewermenu.h') 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); -- cgit v1.3