diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:43:31 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:43:31 +0100 |
commit | a2cb781e59dbe3695fa6984c78ab606e87a4b970 (patch) | |
tree | 42f36a9dc0696a28b70a871a3f535951f57a9ef2 /indra/newview | |
parent | 3a651fe40633cb5c63853d354d2ba08b61dacdfd (diff) | |
parent | 87e9828fc95b89f498a33ecfa14671c12c25b6ca (diff) |
merge backout
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index b9008fa53b..f4e4c5b81f 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -988,7 +988,7 @@ void profile_pic_upload_callback(const LLUUID& uuid) void LLSnapshotLivePreview::confirmSavingTexture(bool set_as_profile_pic) { LLSD args; - args["AMOUNT"] = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload(); + args["AMOUNT"] = "10"; // *TODO: there's currently no way to avoid hardcoding the upload price LLNotificationsUtil::add("UploadConfirmation", args, LLSD(), boost::bind(&LLSnapshotLivePreview::onSavingTextureConfirmed, this, _1, _2, set_as_profile_pic)); } |