From 4d852aba0e0b4222557ef4798663db11799f5761 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 14:45:04 +0100
Subject: Backed out changeset 688db499e2d1
---
indra/newview/llfloatersnapshot.cpp | 26 ++--------------------
.../newview/skins/default/xui/en/notifications.xml | 12 ----------
2 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index a6a8194685..03389e62d7 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -168,8 +168,6 @@ public:
void setSnapshotBufferType(LLViewerWindow::ESnapshotType type) { mSnapshotBufferType = type; }
void updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail = FALSE, F32 delay = 0.f);
LLFloaterPostcard* savePostcard();
- void confirmSavingTexture(bool set_as_profile_pic = false);
- bool onSavingTextureConfirmed(const LLSD& notification, const LLSD& response, bool set_as_profile_pic);
void saveTexture(bool set_as_profile_pic = false);
BOOL saveLocal();
void saveWeb(std::string url);
@@ -985,26 +983,6 @@ void profile_pic_upload_callback(const LLUUID& uuid)
floater->setAsProfilePic(uuid);
}
-void LLSnapshotLivePreview::confirmSavingTexture(bool set_as_profile_pic)
-{
- LLSD args;
- 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));
-}
-
-bool LLSnapshotLivePreview::onSavingTextureConfirmed(const LLSD& notification, const LLSD& response, bool set_as_profile_pic)
-{
- S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-
- if (option == 0)
- {
- saveTexture(set_as_profile_pic);
- }
-
- return false;
-}
-
void LLSnapshotLivePreview::saveTexture(bool set_as_profile_pic)
{
@@ -1768,7 +1746,7 @@ void LLFloaterSnapshot::Impl::onCommitProfilePic(LLFloaterSnapshot* view)
if(previewp)
{
- previewp->confirmSavingTexture(true);
+ previewp->saveTexture(true);
}
}
@@ -1790,7 +1768,7 @@ void LLFloaterSnapshot::Impl::onCommitSnapshot(LLFloaterSnapshot* view, LLSnapsh
}
else if (type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE)
{
- previewp->confirmSavingTexture();
+ previewp->saveTexture();
}
else if (type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD)
{
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ff8de3514f..e8ba8c683d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4375,18 +4375,6 @@ Uploading in-world and web site snapshots...
(Takes about 5 minutes.)
</notification>
- <notification
- icon="alertmodal.tga"
- name="UploadConfirmation"
- type="alertmodal">
-Uploading costs L$[AMOUNT].
-Do you wish to proceed?
- <usetemplate
- name="okcancelbuttons"
- notext="Cancel"
- yestext="Upload"/>
- </notification>
-
<notification
icon="notify.tga"
name="UploadPayment"
--
cgit v1.2.3