diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-10-05 20:17:29 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-10-05 20:17:29 -0700 |
| commit | 6b8916e7604d47f37d30ae0c1a6ab2465da1f39d (patch) | |
| tree | eaf797d9424fa07528c401cfa273a5961d28c498 /indra/newview/llstartup.cpp | |
| parent | 31d5383417000738a29c8f664124e140b1afce5d (diff) | |
DD-170 : Handle 503 answer from SLM and added a MARKET_MERCHANT_NOT_MIGRATED state to the UI, showing only the relevant UI to the user (i.e. Merchant Outbox or Marketplace Listings).
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 8 |
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")) { |