diff options
Diffstat (limited to 'indra/newview/llfloateroutbox.cpp')
| -rwxr-xr-x | indra/newview/llfloateroutbox.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp index fa628f2a08..90da9ad2c0 100755 --- a/indra/newview/llfloateroutbox.cpp +++ b/indra/newview/llfloateroutbox.cpp @@ -238,6 +238,11 @@ void LLFloaterOutbox::setupOutbox() llerrs << "Inventory problem: failure to create the outbox for a merchant!" << llendl; return; } + + // Consolidate Merchant Outbox + // We shouldn't have to do that but with a client/server system relying on a "well known folder" convention, things get messy and conventions get broken down eventually + gInventory.consolidateForType(outbox_id, LLFolderType::FT_OUTBOX); + if (outbox_id == mOutboxId) { llwarns << "Inventory warning: Merchant outbox already set" << llendl; |