summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/examples
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-08-13 15:32:47 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-08-13 15:32:47 -0400
commit23f2631d598b6e07450a96ed1ec00670c8867cdd (patch)
tree20195c1688ad8cb7e8631c97fa5920624f10972c /indra/llcorehttp/examples
parent54334ff6e377e35c97df3a0fe2a859795ec07b21 (diff)
parent8ce3323269d95f54e2b768c4c5aa154d4afbbb6b (diff)
Merge branch 'develop' into nat/edu-channel
Diffstat (limited to 'indra/llcorehttp/examples')
-rw-r--r--indra/llcorehttp/examples/http_texture_load.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcorehttp/examples/http_texture_load.cpp b/indra/llcorehttp/examples/http_texture_load.cpp
index 4d1e52b766..72e0c29a24 100644
--- a/indra/llcorehttp/examples/http_texture_load.cpp
+++ b/indra/llcorehttp/examples/http_texture_load.cpp
@@ -24,6 +24,8 @@
* $/LicenseInfo$
*/
+#include "linden_common.h"
+
#include <iostream>
#include <cstdio>
#include <cstdlib>
@@ -33,8 +35,6 @@
#include <pthread.h>
#endif
-#include "linden_common.h"
-
#include "httpcommon.h"
#include "httprequest.h"
#include "httphandler.h"
@@ -519,7 +519,7 @@ void WorkingSet::onCompleted(LLCore::HttpHandle handle, LLCore::HttpResponse * r
{
// More success
LLCore::BufferArray * data(response->getBody());
- mByteCount += data ? data->size() : 0;
+ mByteCount += data ? static_cast<long>(data->size()) : 0L;
++mSuccesses;
}
else
@@ -602,7 +602,7 @@ void WorkingSet::loadAssetUuids(FILE * in)
mAssets.push_back(asset);
}
}
- mRemaining = mLimit = mAssets.size();
+ mRemaining = mLimit = static_cast<int>(mAssets.size());
}