summaryrefslogtreecommitdiff
path: root/indra/newview/llsnapshotlivepreview.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2017-06-09 18:16:58 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2017-06-09 18:16:58 +0300
commit5e905cf80d472c433875452a2baaa179ceb0fe71 (patch)
tree05d3dd1c9b4b33e77329c146df125d4ac1e3abc0 /indra/newview/llsnapshotlivepreview.cpp
parent2b6ab45210113950ea575ef62280c15fad30ff96 (diff)
MAINT-7477 FIXED [viewer-neko] Viewer crashes when saving snapshot to disk and closing file picker window
Diffstat (limited to 'indra/newview/llsnapshotlivepreview.cpp')
-rw-r--r--indra/newview/llsnapshotlivepreview.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index c6f8c414fa..ee8b2d79c0 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -1080,12 +1080,13 @@ BOOL LLSnapshotLivePreview::saveLocal()
return success;
}
-//Check if failed due to insuficient memory
+//Check if failed due to insufficient memory
BOOL LLSnapshotLivePreview::saveLocal(LLPointer<LLImageFormatted> mFormattedImage)
{
- BOOL success = gViewerWindow->saveImageNumbered(mFormattedImage);
+ BOOL insufficient_memory;
+ BOOL success = gViewerWindow->saveImageNumbered(mFormattedImage, FALSE, insufficient_memory);
- if (!success)
+ if (insufficient_memory)
{
std::string lastSnapshotDir = LLViewerWindow::getLastSnapshotDir();