diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-08-02 12:44:50 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-08-02 12:44:50 -0700 |
| commit | dd70cc8f32aab7712f92198c43c8b4d86b8c5e73 (patch) | |
| tree | 8ff28dbade842cfc94d74b919de806f2371d2331 /indra/newview | |
| parent | b19b2737b2965900e55485a5887815ce97aa9dd7 (diff) | |
ACME : Fix a spurious crash when showing the Advanced->Shortcuts menu just after launch
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatersocial.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |