From dd70cc8f32aab7712f92198c43c8b4d86b8c5e73 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 2 Aug 2013 12:44:50 -0700 Subject: ACME : Fix a spurious crash when showing the Advanced->Shortcuts menu just after launch --- indra/newview/llfloatersocial.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index 4c8aec4e99..4cbc9c0218 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -374,7 +374,7 @@ void LLSocialPhotoPanel::updateControls() LLSnapshotLivePreview* previewp = getPreviewView(); BOOL got_bytes = previewp && previewp->getDataSize() > 0; BOOL got_snap = previewp && previewp->getSnapshotUpToDate(); - LLSnapshotLivePreview::ESnapshotType shot_type = previewp->getSnapshotType(); + LLSnapshotLivePreview::ESnapshotType shot_type = (previewp ? previewp->getSnapshotType() : LLSnapshotLivePreview::SNAPSHOT_POSTCARD); // *TODO: Separate maximum size for Web images from postcards lldebugs << "Is snapshot up-to-date? " << got_snap << llendl; -- cgit v1.2.3