diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-06-27 23:58:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-27 23:58:12 -0400 |
| commit | 06a9e45fa371365f56549fe1c1628bf7cf8589d1 (patch) | |
| tree | 601bfe8f31052620321811582244d12a29d6d7a1 /indra/newview/llviewerwindow.cpp | |
| parent | 895db142ee9224e1b8e4d2fc6348dc1801bea0dc (diff) | |
| parent | a50a0e1277386de3456f478127f774fa01cdb578 (diff) | |
Merge pull request #4308 from secondlife/geenz/develop-to-gltf-mesh
Geenz/develop to gltf mesh
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index d2685bcc48..f14ca62c83 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4780,7 +4780,18 @@ void LLViewerWindow::saveImageLocal(LLImageFormatted *image, const snapshot_save #else boost::filesystem::path b_path(lastSnapshotDir); #endif - if (!boost::filesystem::is_directory(b_path)) + boost::system::error_code ec; + if (!boost::filesystem::is_directory(b_path, ec) || ec.failed()) + { + LLSD args; + args["PATH"] = lastSnapshotDir; + LLNotificationsUtil::add("SnapshotToLocalDirNotExist", args); + resetSnapshotLoc(); + failure_cb(); + return; + } + boost::filesystem::space_info b_space = boost::filesystem::space(b_path, ec); + if (ec.failed()) { LLSD args; args["PATH"] = lastSnapshotDir; @@ -4789,7 +4800,6 @@ void LLViewerWindow::saveImageLocal(LLImageFormatted *image, const snapshot_save failure_cb(); return; } - boost::filesystem::space_info b_space = boost::filesystem::space(b_path); if (b_space.free < image->getDataSize()) { LLSD args; @@ -4806,6 +4816,8 @@ void LLViewerWindow::saveImageLocal(LLImageFormatted *image, const snapshot_save LLNotificationsUtil::add("SnapshotToComputerFailed", args); failure_cb(); + + // Shouldn't there be a return here? } // Look for an unused file name |