summaryrefslogtreecommitdiff
path: root/indra/llmessage/llsdmessage.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-05-08 10:18:03 -0700
committerMerov Linden <merov@lindenlab.com>2012-05-08 10:18:03 -0700
commit60f602d5e12a50623b51b13e097992f79006823f (patch)
tree386e3cf5b25f3292e3ba7c8a9b0524c5bfbb9589 /indra/llmessage/llsdmessage.cpp
parent29da931051202a10ea71db56e47acecae1603a5d (diff)
parentccb86a2a6675b21dda6267d4a850e5a09acbafa4 (diff)
Pull from VirLinden/drano
Diffstat (limited to 'indra/llmessage/llsdmessage.cpp')
-rw-r--r--indra/llmessage/llsdmessage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llsdmessage.cpp b/indra/llmessage/llsdmessage.cpp
index 9148c9dd15..1c93c12d99 100644
--- a/indra/llmessage/llsdmessage.cpp
+++ b/indra/llmessage/llsdmessage.cpp
@@ -88,7 +88,7 @@ bool LLSDMessage::httpListener(const LLSD& request)
request,
url, "POST", reply, error),
LLSD(), // headers
- timeout);
+ (F32)timeout);
return false;
}