diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2019-07-12 14:21:04 +0000 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2019-07-12 14:21:04 +0000 |
| commit | 3c0469cbbde1dc8c5f691443a50bf9bc41b0ae99 (patch) | |
| tree | 052ea645030d0aef8167bf484d37533118dc672e /indra | |
| parent | f69db2616b032adf55bc696dcef12d4a7fb88b8a (diff) | |
| parent | 9c966e51daaec60afe6338bc5a9d0a3579050e24 (diff) | |
Merged in ruslantproductengine/viewer-cougar-4cr-5 (pull request #59)
SL-11435 When ALM is enabled, Depth mode shots are broken when snapshot size is set to anything above current window size
Approved-by: Simon Linden <simon@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index c08aaf3f50..a7931137b0 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -784,6 +784,7 @@ void LLFloaterSnapshot::Impl::onCommitLayerTypes(LLUICtrl* ctrl, void*data) previewp->setSnapshotBufferType((LLSnapshotModel::ESnapshotLayerType)combobox->getCurrentIndex()); } view->impl->checkAutoSnapshot(previewp, TRUE); + previewp->updateSnapshot(TRUE, TRUE); } } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 963952fdb1..e4f3b9bae4 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4620,7 +4620,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei if ((image_width <= gGLManager.mGLMaxTextureSize && image_height <= gGLManager.mGLMaxTextureSize) && (image_width > window_width || image_height > window_height) && LLPipeline::sRenderDeferred && !show_ui) { - if (scratch_space.allocate(image_width, image_height, GL_RGBA, true, true)) + if (scratch_space.allocate(image_width, image_height, GL_DEPTH_COMPONENT, true, true)) { original_width = gPipeline.mDeferredScreen.getWidth(); original_height = gPipeline.mDeferredScreen.getHeight(); |