diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-04-16 23:45:35 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-04-16 23:45:35 +0000 |
| commit | b01c75cb423f07a3d3354f8bd62f265f80062b3b (patch) | |
| tree | dec1b220c24a60cc220d1cb07fd3545610644f0a /indra/newview/llpanelpermissions.cpp | |
| parent | 868250bdd74f348557102c0d8408d9bec30331f6 (diff) | |
svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
| -rw-r--r-- | indra/newview/llpanelpermissions.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index da8c9a9ac7..389f06f355 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -1034,7 +1034,7 @@ void LLPanelPermissions::setAllSaleInfo() { // Don't extract the price if it's labeled as MIXED or is empty. const std::string& editPriceString = editPrice->getText(); - if (editPriceString != getString("Cost Mixed") && + if (editPriceString != getString("Cost Mixed") && editPriceString != getString("Sale Mixed") && !editPriceString.empty()) { price = atoi(editPriceString.c_str()); @@ -1048,12 +1048,6 @@ void LLPanelPermissions::setAllSaleInfo() if (price < 0) sale_type = LLSaleInfo::FS_NOT; - // Force the sale price of not-for-sale items to DEFAULT_PRICE. - if (sale_type == LLSaleInfo::FS_NOT) - { - price = DEFAULT_PRICE; - } - // Pack up the sale info and send the update. LLSaleInfo sale_info(sale_type, price); LLSelectMgr::getInstance()->selectionSetObjectSaleInfo(sale_info); |