diff options
| author | Richard Linden <none@none> | 2012-01-18 13:36:16 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-18 13:36:16 -0800 |
| commit | a1b200878fdc517252506a19f71432ab956086c2 (patch) | |
| tree | 627d180f48cc8dca01f9144da39b2fa6fbd84979 /indra/llmessage/llcurl.h | |
| parent | 41a43a4125a69835e6a76f5792a267ba0797f41a (diff) | |
| parent | b1d28300fbd37edfb4093b13ea0d243e45d6952b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llmessage/llcurl.h')
| -rw-r--r-- | indra/llmessage/llcurl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h index 705cdcbbcc..9c2c215c7a 100644 --- a/indra/llmessage/llcurl.h +++ b/indra/llmessage/llcurl.h @@ -349,7 +349,7 @@ public: LLCurlThread(bool threaded = true) ; virtual ~LLCurlThread() ; - S32 update(U32 max_time_ms); + S32 update(F32 max_time_ms); void addMulti(LLCurl::Multi* multi) ; void killMulti(LLCurl::Multi* multi) ; |