livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset b447707f20f5

master
Tofu Linden 2010-06-15 14:49:16 +01:00
parent 11e6e208d4
commit 5ad91abfdf
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llfloatersnapshot.cpp
View File

@ -1045,24 +1045,9 @@ class LLSendWebResponder : public LLHTTPClient::Responder
{
public:
virtual void error(U32 status, const std::string& reason)
void result(const LLSD& content)
{
llwarns << status << ": " << reason << llendl;
LLNotificationsUtil::add("ShareToWebFailed");
}
virtual void result(const LLSD& content)
{
std::string response_url = content["response_url"].asString();
if (!response_url.empty())
{
LLWeb::loadURLExternal(response_url);
}
else
{
LLNotificationsUtil::add("ShareToWebFailed");
}
LLWeb::loadURLExternal(content["response_url"]);
}
};

7
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -5292,13 +5292,6 @@ Failed to find [TYPE] in database.
Failed to find [TYPE] named [DESC] in database.
</notification>
<notification
icon="notify.tga"
name="ShareToWebFailed"
type="notify">
Failed to upload image to web.
</notification>
<notification
icon="notify.tga"
name="InvalidWearable"