summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rwxr-xr-xindra/newview/llstartup.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 74df18810c..77a5f4989b 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1875,6 +1875,14 @@ bool idle_startup()
}
display_startup();
+
+ // Init SLM Marketplace connection so we know which UI should be used for the user as a merchant
+ // Note: Eventually, all merchant will be migrated to the new SLM system and there will be no
+ // reason to show the old UI at all.
+ // *TODO : Suppress the Merchant Outbox UI completely
+ check_merchant_status();
+
+ display_startup();
if (gSavedSettings.getBOOL("HelpFloaterOpen"))
{