summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcurl.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-12-05 17:56:38 -0600
committerDave Parks <davep@lindenlab.com>2011-12-05 17:56:38 -0600
commit1516e4c4971152273dc4f1055eaaae117419a8f6 (patch)
treec7c2c9265897974e80aca2cfb56319cb9f744515 /indra/llmessage/llcurl.cpp
parent66c72be939012ddacdf0831f380e758569172b15 (diff)
parent78233d1bf9930575ee7250257ac68603f41f568a (diff)
merge
Diffstat (limited to 'indra/llmessage/llcurl.cpp')
-rw-r--r--indra/llmessage/llcurl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 228f039132..964580fc3f 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -837,7 +837,7 @@ LLCurlThread::~LLCurlThread()
{
}
-S32 LLCurlThread::update(U32 max_time_ms)
+S32 LLCurlThread::update(F32 max_time_ms)
{
return LLQueuedThread::update(max_time_ms);
}