diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-30 14:50:37 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-30 14:50:37 -0400 |
commit | 77da469d6f7901ee0cddf5fb351cd2a756b217f0 (patch) | |
tree | e0d7326fc438f7b579e3ddbcbb4772afa5402d23 /indra/newview/llsnapshotlivepreview.cpp | |
parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
parent | d4fb82c217bccda536f7a7b2ca1809bb8c2dba40 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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, |