summaryrefslogtreecommitdiff
path: root/indra/newview/lluploadfloaterobservers.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-12 12:10:24 -0400
committerOz Linden <oz@lindenlab.com>2013-04-12 12:10:24 -0400
commitedf5b6a8b71d9c4c01ce9c975864d4525cd7350c (patch)
tree68310a6824451c8c6f3af8ef73f2f9ec17c3a467 /indra/newview/lluploadfloaterobservers.cpp
parent01fb17cbc5a1d6a3526c4115787dbae74f7bdb07 (diff)
parent460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff)
pull changes for Sunshine beta
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();