diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-18 22:10:55 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-18 22:41:39 +0300 |
| commit | 5939fc845815906db279434bad1b7c3296be25dc (patch) | |
| tree | 2012ea51e87752bedb60e44fce80921cdda747c3 /indra/newview | |
| parent | 4b1a0e51b0e636b0b4cb8b32557283d16794d074 (diff) | |
Buildfix
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index ab98c5f50f..e1b58dde51 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -1616,10 +1616,6 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url) { from_group = message_data["from_group"].asString() == "Y"; } - else - { - from_group = message_data["from_group"].asString() == "Y"; - } LLIMProcessing::processNewMessage( 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 { |