diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-06 09:53:57 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-06 09:53:57 -0500 |
commit | b3e34545a4d37444a2def3462d75e185df5535d0 (patch) | |
tree | f4a09ef60040db8399528a7f3564b5d265b3e22a /indra/newview/lluploadfloaterobservers.cpp | |
parent | 7b0b5726dd2fcf5b79ed1b112891655fad0f96eb (diff) | |
parent | 54cdc322b8f2bd35b289cacf3493622e7cc51194 (diff) |
merge
Diffstat (limited to 'indra/newview/lluploadfloaterobservers.cpp')
-rw-r--r-- | indra/newview/lluploadfloaterobservers.cpp | 5 |
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(); |