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/llsnapshotlivepreview.cpp | |
parent | 33c88a1c6037290924691db59c6538a370946ea4 (diff) | |
parent | 687efd84eabc524e339e61458b0cbf53f9a38f8a (diff) |
MAINT-5232: merge LLError::Log::demangle() to tip
Diffstat (limited to 'indra/newview/llsnapshotlivepreview.cpp')
-rw-r--r-- | indra/newview/llsnapshotlivepreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp index 0ae8a338e0..2e9df1f13f 100644 --- a/indra/newview/llsnapshotlivepreview.cpp +++ b/indra/newview/llsnapshotlivepreview.cpp @@ -1005,7 +1005,7 @@ void LLSnapshotLivePreview::saveTexture() std::string who_took_it; LLAgentUI::buildFullname(who_took_it); LLAssetStorage::LLStoreAssetCallback callback = NULL; - S32 expected_upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload(); + S32 expected_upload_cost = LLGlobalEconomy::getInstance()->getPriceUpload(); void *userdata = NULL; upload_new_resource(tid, // tid LLAssetType::AT_TEXTURE, |