diff options
author | Merov Linden <merov@lindenlab.com> | 2010-09-24 11:23:07 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-09-24 11:23:07 -0700 |
commit | b85cf7b12562a3359e52147d26eb1051ce388559 (patch) | |
tree | 3f656bb586e7cd2a25763d8053365e106365a063 /indra/newview/llfloaterbuycontents.cpp | |
parent | 24473fc0d619beaafab029170a7aacde5855be1a (diff) | |
parent | b34856d66dfa1a725cb85d813982709566b6db7a (diff) |
Pull update from viewer-development
Diffstat (limited to 'indra/newview/llfloaterbuycontents.cpp')
-rw-r--r-- | indra/newview/llfloaterbuycontents.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp index 77fb5590df..a7388d21a3 100644 --- a/indra/newview/llfloaterbuycontents.cpp +++ b/indra/newview/llfloaterbuycontents.cpp @@ -41,6 +41,7 @@ #include "llinventorydefines.h" #include "llinventoryfunctions.h" #include "llinventorymodel.h" // for gInventory +#include "llfirstuse.h" #include "llfloaterreg.h" #include "llfloaterinventory.h" // for LLInventoryIcon::getIcon #include "llnotificationsutil.h" @@ -54,7 +55,6 @@ LLFloaterBuyContents::LLFloaterBuyContents(const LLSD& key) : LLFloater(key) { -// LLUICtrlFactory::getInstance()->buildFloater(this, "floater_buy_contents.xml"); } BOOL LLFloaterBuyContents::postBuild() @@ -284,6 +284,10 @@ void LLFloaterBuyContents::onClickBuy() // it doesn't match region info then sale is canceled. LLSelectMgr::getInstance()->sendBuy(gAgent.getID(), category_id, mSaleInfo); + // NOTE: do this here instead of on receipt of object, since contents are transfered + // via a generic BulkUpdateInventory message with no way of distinguishing it from + // other inventory operations + LLFirstUse::newInventory(); closeFloater(); } |