From cdbd97c41fb43ced0fa55e77eac65057ac2b71ad Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Thu, 5 Mar 2009 02:05:06 +0000 Subject: 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 --- indra/newview/llpreviewtexture.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpreviewtexture.cpp') 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; -- cgit v1.2.3