summaryrefslogtreecommitdiff
path: root/indra/newview/llcompilequeue.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2014-06-27 12:57:16 -0700
committerdolphin <dolphin@lindenlab.com>2014-06-27 12:57:16 -0700
commitdd309984d7566710b9ceaf8f6edf2de1672f4f9c (patch)
tree41d0b99eceeb52d4b05dfe10877e1b0b2b70fd90 /indra/newview/llcompilequeue.cpp
parent74634fb9dae5280c5a020b25f027a6f910053feb (diff)
parentf80a41cf36f023aa0b5a7368d81dd237dafc8d4a (diff)
Merge
Diffstat (limited to 'indra/newview/llcompilequeue.cpp')
-rwxr-xr-xindra/newview/llcompilequeue.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index 9e554ba0eb..d9fd4509a5 100755
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -251,11 +251,11 @@ public:
LLUUID mParent;
- virtual void result(const LLSD& content)
+ /*virtual*/ void httpSuccess()
{
- sendResult(content);
+ sendResult(getContent());
}
- virtual void error(U32 status, const std::string& reason)
+ /*virtual*/ void httpFailure()
{
sendResult(LLSD());
}