diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-06-13 14:59:28 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-06-13 14:59:28 -0700 |
| commit | 5e60392c273f0c9c5efa765a05414c618381780a (patch) | |
| tree | d1eedbb1dfa86e66532a6d8746b7a81e5a444d3a /indra/newview/llwebprofile.cpp | |
| parent | 0f3c3563b0861e8ea82b201aab8343d99f993bbc (diff) | |
| parent | 100ebbab2437de7f5d124a0d7b8279a7a7b57656 (diff) | |
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llwebprofile.cpp')
| -rw-r--r-- | indra/newview/llwebprofile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp index 02abf1d4e3..83e417633a 100644 --- a/indra/newview/llwebprofile.cpp +++ b/indra/newview/llwebprofile.cpp @@ -42,7 +42,7 @@ #include "llcorehttputil.h" // third-party -#include "json/reader.h" // JSON + /* * Workflow: @@ -239,10 +239,12 @@ LLCore::BufferArray::ptr_t LLWebProfile::buildPostData(const LLSD &data, LLPoint << "Content-Disposition: form-data; name=\"file\"; filename=\"snapshot.png\"\r\n" << "Content-Type: image/png\r\n\r\n"; + LLImageDataSharedLock lock(image); + // Insert the image data. //char *datap = (char *)(image->getData()); //bas.write(datap, image->getDataSize()); - U8* image_data = image->getData(); + const U8* image_data = image->getData(); for (S32 i = 0; i < image->getDataSize(); ++i) { bas << image_data[i]; |