diff options
author | Andrew Polunin <apolunin@productengine.com> | 2010-05-25 15:31:07 +0300 |
---|---|---|
committer | Andrew Polunin <apolunin@productengine.com> | 2010-05-25 15:31:07 +0300 |
commit | ecd93410ff819bb301f115e40c8f2d6fef8b2396 (patch) | |
tree | 27fa100de9463448cadc3f7f1845b53248a2dfde /indra/newview/llpanelmaininventory.cpp | |
parent | cb0589715265dc1568626fe238aac7417b44ef89 (diff) |
EXT-7142 FIXED Upload functionality duplicated in the Build menu and Select Linked Parts menu moved up
- LLPanelMainInventory::setUploadCostIfNeeded() - uncommented the line which enables retrieving of the upload cost price using LLGlobalEconomy class.
- Implemented LLUploadCostCalculator event handler in the llviewermenu.cpp (the fact that it should be implemented in this file was discussed with Mike Antipov).
- LLUploadCostCalculator::calculateCost() is implemented only for code readability: it's name is more descriptive than a code snippet placed directly in the constructor (LLPanelMainInventory::setUploadCostIfNeeded() works in similar way: it calculates cost_str only once).
- 'Select Linked Parts' menu was moved below 'Edit Linked Parts'.
- 'Upload' menu was added at the bottom, below 'Options' menu
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/425/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 5ff51b8165..54d1b46016 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -1187,7 +1187,7 @@ void LLPanelMainInventory::setUploadCostIfNeeded() LLMenuItemBranchGL* upload_menu = mMenuAdd->findChild<LLMenuItemBranchGL>("upload"); if(upload_menu) { - S32 upload_cost = -1;//LLGlobalEconomy::Singleton::getInstance()->getPriceUpload(); + S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload(); std::string cost_str; // getPriceUpload() returns -1 if no data available yet. |