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/llmessage/llsdmessage.h | |
| 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/llmessage/llsdmessage.h')
| -rw-r--r-- | indra/llmessage/llsdmessage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llsdmessage.h b/indra/llmessage/llsdmessage.h index 8ae9451243..65503756a8 100644 --- a/indra/llmessage/llsdmessage.h +++ b/indra/llmessage/llsdmessage.h @@ -131,7 +131,7 @@ private: {} virtual void result(const LLSD& data); - virtual void error(U32 status, const std::string& reason, const LLSD& content); + virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content); private: LLEventPumps& mPumps; |