diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-26 16:24:49 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-26 16:24:49 -0700 |
| commit | c5c13a92eb62e1e9927a9685d5433c040e6ef2ce (patch) | |
| tree | 0134513ccbd15cccd193bc38772eb5147e0f4591 /indra/newview/llpanelmaininventory.cpp | |
| parent | abcdff128c85c5a1188da8e36510f249e5918899 (diff) | |
| parent | db119d86a7a930c64b022c41386d37c001555d68 (diff) | |
Merge
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. |