livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-8764 FIXED Crash in LLViewerWindow::saveImageNumbered()

meow-7.2.2
maxim_productengine 2018-06-20 16:28:53 +03:00
parent 5f8d54d092
commit 112d3de66f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llviewerwindow.cpp
View File

@ -4436,6 +4436,15 @@ void LLViewerWindow::saveImageLocal(LLImageFormatted *image, const snapshot_save
#else
boost::filesystem::path b_path(lastSnapshotDir);
#endif
if (!boost::filesystem::is_directory(b_path))
{
LLSD args;
args["PATH"] = lastSnapshotDir;
LLNotificationsUtil::add("SnapshotToLocalDirNotExist", args);
resetSnapshotLoc();
failure_cb();
return;
}
boost::filesystem::space_info b_space = boost::filesystem::space(b_path);
if (b_space.free < image->getDataSize())
{

5
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -8260,6 +8260,11 @@ Failed to save appearance to XML.
Failed to save snapshot to [PATH]: Disk is full. [NEED_MEMORY]KB is required but only [FREE_MEMORY]KB is free.
</notification>
<notification icon="notifytip.tga"
name="SnapshotToLocalDirNotExist" type="notifytip">
Failed to save snapshot to [PATH]: Directory does not exist.
</notification>
<notification
icon="notifytip.tga"
name="PresetNotSaved"