diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-02 17:37:29 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-02 17:37:29 -0700 |
| commit | 2a7d604e87df5a48bfb0abeb0d7b897a117005fb (patch) | |
| tree | 783a46ee6f16e484ac35b933bace359b2eb2d1b8 /indra/newview/lluploadfloaterobservers.cpp | |
| parent | cc7440d0853d269a5b955ab021db729ed5b6a92c (diff) | |
| parent | 043f2e0bfd40d29464175de838e3a36aad6e81df (diff) | |
ACME-306 : Pull merge from viewer-chui
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(); |