summaryrefslogtreecommitdiff
path: root/indra/newview/lluploadfloaterobservers.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2013-03-05 22:05:22 -0800
committerDon Kjer <don@lindenlab.com>2013-03-05 22:05:22 -0800
commit54cdc322b8f2bd35b289cacf3493622e7cc51194 (patch)
tree4f686cdfbaaf8819dfb1b015a1c8388ea1f59eac /indra/newview/lluploadfloaterobservers.cpp
parent9a0c52a247ecbd79f5f872ceb97a6be3e0499bea (diff)
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
Diffstat (limited to 'indra/newview/lluploadfloaterobservers.cpp')
-rw-r--r--indra/newview/lluploadfloaterobservers.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lluploadfloaterobservers.cpp b/indra/newview/lluploadfloaterobservers.cpp
index 5a6a17fbca..1d777b3f7f 100644
--- a/indra/newview/lluploadfloaterobservers.cpp
+++ b/indra/newview/lluploadfloaterobservers.cpp
@@ -33,9 +33,10 @@ LLUploadModelPremissionsResponder::LLUploadModelPremissionsResponder(const LLHan
{
}
-void LLUploadModelPremissionsResponder::error(U32 status, const std::string& reason)
+void LLUploadModelPremissionsResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
- llwarns << "LLUploadModelPremissionsResponder::error("<< status << ": " << reason << ")" << llendl;
+ llwarns << "LLUploadModelPremissionsResponder error [status:"
+ << status << "]: " << content << llendl;
LLUploadPermissionsObserver* observer = mObserverHandle.get();