diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-17 21:51:05 +0300 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-08-18 14:12:49 +0300 |
| commit | 4800e3e4164640bc98f92f9c50d2ab7b882f97a1 (patch) | |
| tree | 51390b80aec25084ed3f00b3d8464ee06a9cc6db /indra/newview/llviewertexturelist.h | |
| parent | 78d66efe1a60ad599ede4e459fb04bb9cb962404 (diff) | |
SL-20099 Thumbnail upload scale textures to be square
thumbnail copy&paste only allows square textures and wasn't allowing
none square ones despite those already being used as thumbnails
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
| -rw-r--r-- | indra/newview/llviewertexturelist.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h index eac26ab0eb..8fc65fc9ce 100644 --- a/indra/newview/llviewertexturelist.h +++ b/indra/newview/llviewertexturelist.h @@ -96,8 +96,11 @@ public: const std::string& out_filename, const U8 codec, const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT, - const S32 min_image_dimentions = 0); - static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image, const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT); + const S32 min_image_dimentions = 0, + bool force_square = false); + static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image, + const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT, + bool force_square = false); static void processImageNotInDatabase( LLMessageSystem *msg, void **user_data ); public: |