summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcurl.h
diff options
context:
space:
mode:
authorMark Palange <palange@lindenlab.com>2009-07-16 17:54:58 +0000
committerMark Palange <palange@lindenlab.com>2009-07-16 17:54:58 +0000
commit0274c1f2b16e571a0cc6295d1f3073b136210a7c (patch)
tree4396f7f721befba4f907c0871067e3da1cdf0494 /indra/llmessage/llcurl.h
parent09d9b0556e8cf6c0a716e5b2c78b265799486331 (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/llcurl.h')
-rw-r--r--indra/llmessage/llcurl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index ff63904c91..fbd3077cbf 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -85,7 +85,7 @@ public:
return((200 <= status) && (status < 300));
}
- virtual void error(
+ virtual void errorWithContent(
U32 status,
const std::string& reason,
const LLSD& content);