From 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 Mon Sep 17 00:00:00 2001 From: Eric Tulla Date: Thu, 5 Mar 2009 00:29:27 +0000 Subject: Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272). No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 . --- indra/newview/llprogressview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llprogressview.cpp') diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 031f4ab304..cdcd68de38 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -241,7 +241,7 @@ void LLProgressView::onCancelButtonClicked(void*) void LLProgressView::onClickMessage(void* data) { LLProgressView* viewp = (LLProgressView*)data; - if ( ! viewp->mMessage.empty() ) + if ( viewp != NULL && ! viewp->mMessage.empty() ) { std::string url_to_open( "" ); -- cgit v1.2.3