diff options
author | Mark Palange <palange@lindenlab.com> | 2009-07-16 17:54:58 +0000 |
---|---|---|
committer | Mark Palange <palange@lindenlab.com> | 2009-07-16 17:54:58 +0000 |
commit | 0274c1f2b16e571a0cc6295d1f3073b136210a7c (patch) | |
tree | 4396f7f721befba4f907c0871067e3da1cdf0494 /indra/newview/llhomelocationresponder.cpp | |
parent | 09d9b0556e8cf6c0a716e5b2c78b265799486331 (diff) |
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
Diffstat (limited to 'indra/newview/llhomelocationresponder.cpp')
-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 3ef58e7561..df478a0a04 100644 --- a/indra/newview/llhomelocationresponder.cpp +++ b/indra/newview/llhomelocationresponder.cpp @@ -103,7 +103,7 @@ void LLHomeLocationResponder::result( const LLSD& content ) } } -void LLHomeLocationResponder::error( const LLSD& content ) +void LLHomeLocationResponder::error( U32 status, const std::string& reason ) { - llinfos << "received error(" << ll_pretty_print_sd( content ) << ")" << llendl; + llinfos << "received error(" << reason << ")" << llendl; } |