diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
commit | bad06f68fc3122b5b83f21f1fa8bc7e7ec53bfc8 (patch) | |
tree | cdf1bdc9f6c665eba22645ce4a1fdf7c34d55321 /indra/newview/llhomelocationresponder.cpp | |
parent | 211d1dfb770aa029d77cd231815a5848640b54a6 (diff) | |
parent | af8c2bc94868e056908b4ae2fc285925cd68b56b (diff) |
Merge. Refresh from viewer-release merged with in-progress work.
Diffstat (limited to 'indra/newview/llhomelocationresponder.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/newview/llhomelocationresponder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llhomelocationresponder.cpp b/indra/newview/llhomelocationresponder.cpp index 4850d18d99..37428c4a44 100644..100755 --- a/indra/newview/llhomelocationresponder.cpp +++ b/indra/newview/llhomelocationresponder.cpp @@ -97,7 +97,7 @@ void LLHomeLocationResponder::result( const LLSD& content ) } } -void LLHomeLocationResponder::error( U32 status, const std::string& reason ) +void LLHomeLocationResponder::errorWithContent( U32 status, const std::string& reason, const LLSD& content ) { - llinfos << "received error(" << reason << ")" << llendl; + llwarns << "LLHomeLocationResponder error [status:" << status << "]: " << content << llendl; } |