summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorleyla_linden <none@none>2010-12-03 15:48:17 -0800
committerleyla_linden <none@none>2010-12-03 15:48:17 -0800
commit40e3f15988a2c4ed99673f1f4ea449bab179048a (patch)
treea55a2c5b43a616668c65cb8054ee052041d3c931 /indra
parent35c67ca7fb9964ee3eabeb66ec441ded94256951 (diff)
parentbff87676d7caabfd7b85a1ace18cd6ed6acb39a8 (diff)
Merge
Diffstat (limited to 'indra')
-rw-r--r--indra/llmessage/llhttpassetstorage.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp
index 9ea2ff4153..5a38b7fd9f 100644
--- a/indra/llmessage/llhttpassetstorage.cpp
+++ b/indra/llmessage/llhttpassetstorage.cpp
@@ -174,8 +174,8 @@ LLSD LLHTTPAssetRequest::getFullDetails() const
double curl_total_time = -1.0f;
double curl_size_upload = -1.0f;
double curl_size_download = -1.0f;
- long curl_content_length_upload = -1;
- long curl_content_length_download = -1;
+ double curl_content_length_upload = -1.0f;
+ double curl_content_length_download = -1.0f;
long curl_request_size = -1;
const char* curl_content_type = NULL;
@@ -194,8 +194,8 @@ LLSD LLHTTPAssetRequest::getFullDetails() const
sd["curl_total_time"] = curl_total_time;
sd["curl_size_upload"] = curl_size_upload;
sd["curl_size_download"] = curl_size_download;
- sd["curl_content_length_upload"] = (int) curl_content_length_upload;
- sd["curl_content_length_download"] = (int) curl_content_length_download;
+ sd["curl_content_length_upload"] = curl_content_length_upload;
+ sd["curl_content_length_download"] = curl_content_length_download;
sd["curl_request_size"] = (int) curl_request_size;
if (curl_content_type)
{