diff options
author | Merov Linden <merov@lindenlab.com> | 2013-11-18 16:03:22 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-11-18 16:03:22 -0800 |
commit | 125f3f071a30f4c47feb664b21f3e380ee4e7e49 (patch) | |
tree | c56f1c2a5beba6485865403b8a03e2f78d7b1823 /indra/newview/llfloateroutbox.cpp | |
parent | 6ec99570cd86a89ed6367f81d6b0cccd7fe0e913 (diff) |
MAINT-3319 : WIP : Introduce a consolidate folder method used for Merchant Outbox
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; |