summaryrefslogtreecommitdiff
path: root/indra/newview/lluploadfloaterobservers.cpp
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2013-03-06 17:21:21 -0500
committerNyx Linden <nyx@lindenlab.com>2013-03-06 17:21:21 -0500
commit25255ee13efdc3e8090412f7fce6bb7723277053 (patch)
treef77c6eb77e3cbcfcf72d1b5998a1275fac002d4c /indra/newview/lluploadfloaterobservers.cpp
parent2784a515b0e725f74bf0e5fab47153ba358b26d6 (diff)
parentfe042430b03667abcd6b72ef9cc27d82d85f4242 (diff)
merge
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();