summaryrefslogtreecommitdiff
path: root/indra/newview/llproductinforequest.cpp
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-06-26 17:39:23 +0100
committerIma Mechanique <ima.mechanique@secondlife.com>2013-06-26 17:39:23 +0100
commitb615858d6c41c29b3b610ec0dba09f30b1f8b3a8 (patch)
tree2b193625c9ed4a0ca36e5b5f99f1cc765e979d74 /indra/newview/llproductinforequest.cpp
parente63d92ab504d74399cae2a9cc7625ef3ec330c38 (diff)
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
Merging last four months of development
Diffstat (limited to 'indra/newview/llproductinforequest.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llproductinforequest.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llproductinforequest.cpp b/indra/newview/llproductinforequest.cpp
index 93bf8b2328..1390000fc5 100644..100755
--- a/indra/newview/llproductinforequest.cpp
+++ b/indra/newview/llproductinforequest.cpp
@@ -43,10 +43,10 @@ public:
}
//If we get back an error (not found, etc...), handle it here
- virtual void error(U32 status, const std::string& reason)
+ virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
- llwarns << "LLProductInfoRequest::error("
- << status << ": " << reason << ")" << llendl;
+ llwarns << "LLProductInfoRequest error [status:"
+ << status << ":] " << content << llendl;
}
};