diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-12-14 23:04:55 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-12-14 23:04:55 +0000 |
| commit | 4d87303e78c1accde85b217b325e0c08930b0c4c (patch) | |
| tree | a029a2e0fde70ae31da75ca805dea8d7fba1059a /indra/newview/llfloaterproperties.cpp | |
| parent | 9f5ec4c62c4f44507acd045732555f0814096e93 (diff) | |
svn merge -c 73823 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-4 --> release
Cherry pick fix for showstopper fix: DEV-5701 / SVC-930: Prims set for sale - prices are incorrectly set when multiple prims taken to inventory and rezzed
Diffstat (limited to 'indra/newview/llfloaterproperties.cpp')
| -rw-r--r-- | indra/newview/llfloaterproperties.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp index 538e8415a0..82f72103f7 100644 --- a/indra/newview/llfloaterproperties.cpp +++ b/indra/newview/llfloaterproperties.cpp @@ -867,6 +867,12 @@ void LLFloaterProperties::updateSaleInfo() && item->isComplete()) { LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item); + + // Force an update on the sale price. + U32 flags = new_item->getFlags(); + flags |= LLInventoryItem::II_FLAGS_OBJECT_SLAM_SALE; + new_item->setFlags(flags); + new_item->setSaleInfo(sale_info); if(mObjectID.isNull()) { |