diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-03-05 02:05:06 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-03-05 02:05:06 +0000 |
| commit | cdbd97c41fb43ced0fa55e77eac65057ac2b71ad (patch) | |
| tree | 0cd30b2d480537685ee5a5f8cd901304ccccf069 /indra/newview/llpreviewtexture.cpp | |
| parent | 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 (diff) | |
QAR-1293 - Mergeback of changes made in Viewer 1.22 RC10
svn merge -r112338-112378 svn+ssh://svn/lindenlab.com/svn/linden/branches/viewer/viewer_1-22
to trunk
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
| -rw-r--r-- | indra/newview/llpreviewtexture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index dac461a912..d18cfe85fb 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -303,7 +303,8 @@ void LLPreviewTexture::saveAs() if( mLoadingFullImage ) return; LLFilePicker& file_picker = LLFilePicker::instance(); - if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA, LLDir::getScrubbedFileName(getItem()->getName())) ) + const LLViewerInventoryItem* item = getItem() ; + if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA, item ? LLDir::getScrubbedFileName(item->getName()) : LLStringUtil::null) ) { // User canceled or we failed to acquire save file. return; |