diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-26 15:27:34 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-26 15:27:34 -0400 |
| commit | 3f52cefcc4b4cc00caef56a40e0da1ea981a3073 (patch) | |
| tree | 7697fdea468261e1cd266eed1ba37ecab08c1e16 /indra/newview/llpanelmaininventory.cpp | |
| parent | 33c88a1c6037290924691db59c6538a370946ea4 (diff) | |
| parent | 687efd84eabc524e339e61458b0cbf53f9a38f8a (diff) | |
MAINT-5232: merge LLError::Log::demangle() to tip
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rwxr-xr-x | 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 17c0b226d0..06a7346f2a 100755 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -1278,7 +1278,7 @@ void LLPanelMainInventory::setUploadCostIfNeeded() LLMenuItemBranchGL* upload_menu = mMenuAdd->findChild<LLMenuItemBranchGL>("upload"); if(upload_menu) { - S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload(); + S32 upload_cost = LLGlobalEconomy::getInstance()->getPriceUpload(); std::string cost_str; // getPriceUpload() returns -1 if no data available yet. |