diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-19 13:05:22 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-19 13:05:22 +0300 |
| commit | c7a13e5c9f275214f424c0b1c0ceb7c99ae62bfb (patch) | |
| tree | 55df40cac969d5ec07ad703d104ccccd55fb951a | |
| parent | 5939fc845815906db279434bad1b7c3296be25dc (diff) | |
SL-11898 Restored the code lost on merge
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
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 { |