From c471392ef1c0633423ea66158c21ba4d81f2473b Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 1 Jun 2020 21:34:12 +0300 Subject: SL-13346 Hi-Res snapshots save a zoomed portion on 4K+ resolutions --- indra/newview/llviewermenufile.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewermenufile.cpp') diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index d1d3a7fc12..7603a6b18c 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -683,7 +683,8 @@ class LLFileTakeSnapshotToDisk : public view_listener_t S32 width = gViewerWindow->getWindowWidthRaw(); S32 height = gViewerWindow->getWindowHeightRaw(); - if (gSavedSettings.getBOOL("HighResSnapshot")) + BOOL high_res = gSavedSettings.getBOOL("HighResSnapshot"); + if (high_res) { width *= 2; height *= 2; @@ -695,7 +696,9 @@ class LLFileTakeSnapshotToDisk : public view_listener_t TRUE, FALSE, gSavedSettings.getBOOL("RenderUIInSnapshot"), - FALSE)) + FALSE, + LLSnapshotModel::SNAPSHOT_TYPE_COLOR, + high_res ? S32_MAX : MAX_SNAPSHOT_IMAGE_SIZE)) //per side { LLPointer formatted; LLSnapshotModel::ESnapshotFormat fmt = (LLSnapshotModel::ESnapshotFormat) gSavedSettings.getS32("SnapshotFormat"); -- cgit v1.2.3 From 5939fc845815906db279434bad1b7c3296be25dc Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Tue, 18 Aug 2020 22:10:55 +0300 Subject: Buildfix --- indra/newview/llviewermenufile.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/llviewermenufile.cpp') diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 7eacb109ce..de31ccc87e 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -688,9 +688,6 @@ class LLFileTakeSnapshotToDisk : public view_listener_t { width *= 2; height *= 2; - // not compatible wirh UI/HUD - render_ui = false; - render_hud = false; } if (gViewerWindow->rawSnapshot(raw, @@ -700,6 +697,7 @@ class LLFileTakeSnapshotToDisk : public view_listener_t FALSE, gSavedSettings.getBOOL("RenderUIInSnapshot"), FALSE, + FALSE, LLSnapshotModel::SNAPSHOT_TYPE_COLOR, high_res ? S32_MAX : MAX_SNAPSHOT_IMAGE_SIZE)) //per side { -- cgit v1.2.3 From c7a13e5c9f275214f424c0b1c0ceb7c99ae62bfb Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 19 Aug 2020 13:05:22 +0300 Subject: SL-11898 Restored the code lost on merge --- indra/newview/llviewermenufile.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewermenufile.cpp') diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index de31ccc87e..142108f069 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -683,11 +683,17 @@ class LLFileTakeSnapshotToDisk : public view_listener_t S32 width = gViewerWindow->getWindowWidthRaw(); S32 height = gViewerWindow->getWindowHeightRaw(); + bool render_ui = gSavedSettings.getBOOL("RenderUIInSnapshot"); + bool render_hud = gSavedSettings.getBOOL("RenderHUDInSnapshot"); + BOOL high_res = gSavedSettings.getBOOL("HighResSnapshot"); if (high_res) { width *= 2; height *= 2; + // not compatible with UI/HUD + render_ui = false; + render_hud = false; } if (gViewerWindow->rawSnapshot(raw, @@ -695,9 +701,9 @@ class LLFileTakeSnapshotToDisk : public view_listener_t height, TRUE, FALSE, - gSavedSettings.getBOOL("RenderUIInSnapshot"), + render_ui, + render_hud, FALSE, - FALSE, LLSnapshotModel::SNAPSHOT_TYPE_COLOR, high_res ? S32_MAX : MAX_SNAPSHOT_IMAGE_SIZE)) //per side { -- cgit v1.2.3 From cc794988a759dd0f523a19a994514ce49fbc98da Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 19 Nov 2020 18:13:45 +0200 Subject: SL-13487 File extension checks should ignore case --- indra/newview/llviewermenufile.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewermenufile.cpp') diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 865ac2bb7b..4b231c7067 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -391,7 +391,9 @@ const void upload_single_file(const std::vector& filenames, LLFileP } if (type == LLFilePicker::FFLOAD_ANIM) { - if (filename.rfind(".anim") != std::string::npos) + std::string filename_lc(filename); + LLStringUtil::toLower(filename_lc); + if (filename_lc.rfind(".anim") != std::string::npos) { LLFloaterReg::showInstance("upload_anim_anim", LLSD(filename)); } -- cgit v1.2.3