summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-06-22 13:35:13 -0700
committerRider Linden <rider@lindenlab.com>2016-06-22 13:35:13 -0700
commit0a9f25bcfbc977cf894e83fda95d7ff693039923 (patch)
tree9dbf93947bf2d368e74c9847c3996cbad60da55b /indra/newview/llviewermenu.h
parentc8b662814093fa6ed592fb9cb5118a1401fdc488 (diff)
MAINT-6385: Ensure that VMM initialization only happens once after login and that it will only happen after the region caps have been received.
Diffstat (limited to 'indra/newview/llviewermenu.h')
-rw-r--r--indra/newview/llviewermenu.h2
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);