diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-08-19 16:20:29 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-08-19 16:20:29 -0700 |
| commit | 7b09592bf9968dfda5c4cedf4b55e0459e6bd764 (patch) | |
| tree | da1bc3376313d21c290ae330f7eebfbaa082f4ae /indra/newview/llviewermedia.cpp | |
| parent | 38aa19614e1242e02c23a5dd2fbf5fae49783ed9 (diff) | |
EXP-840 FIX -- Create outbox panels to help the user get started on the marketplace and to indicate drag and drop targets.
EXP-858 PROGRESS -- Outbox sync failure error handling
EXP-908 FIX -- Hide outbox when appropriate
EXP-1062 FIX -- Add modal dialog for outbox sync complete
EXP-1096 FIX -- Extra space below Received Items panel for an account that does not have a Merchant Account setup, no outbox display
EXP-1104 FIX -- User can activate Merchant Outbox synch button when outbox is empty
* Added separate class for outbox view to support error tag rendering
* Added confirmation for sync complete.
* Added different outbox messages for empty outbox, non-merchant and error: merchant but no outbox
* Progress on a bunch of other fronts.
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index fc71e19a7d..e403034eaf 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1381,15 +1381,17 @@ public: std::string merchantStatus = content[gAgent.getID().getString()].asString(); llinfos << "Marketplace merchant status: " << merchantStatus << llendl; + // Save the merchant status before turning on the display + gSavedSettings.setString("InventoryMarketplaceUserStatus", merchantStatus); + // Complete success gSavedSettings.setBOOL("InventoryDisplayInbox", true); - gSavedSettings.setBOOL("InventoryDisplayOutbox", (merchantStatus == "merchant")); + gSavedSettings.setBOOL("InventoryDisplayOutbox", true); } else if (status == 401) { // API is available for use but OpenID authorization failed gSavedSettings.setBOOL("InventoryDisplayInbox", true); - //gSavedSettings.setBOOL("InventoryDisplayOutbox", true); } else { |