diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-26 09:45:14 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-26 09:45:14 -0400 |
commit | f4a772b2b8e70eb3ef3b734a7d3e1623e3f1be15 (patch) | |
tree | cc1759aeb34319f3af32085a7fc778fca7eda92d /indra/newview/llfloatersnapshot.cpp | |
parent | 020757ff0170aa894c56cd719d46413c9e99fde6 (diff) | |
parent | 9db683c13e67575bd347cf8a795f1a4ee148c4ea (diff) |
DRTVWR-453: Update from MAINT (viewer-lynx).
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
-rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 156b2ba7b1..c08aaf3f50 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1309,17 +1309,15 @@ void LLFloaterSnapshot::saveTexture() previewp->saveTexture(); } -BOOL LLFloaterSnapshot::saveLocal() +void LLFloaterSnapshot::saveLocal(const snapshot_saved_signal_t::slot_type& success_cb, const snapshot_saved_signal_t::slot_type& failure_cb) { LL_DEBUGS() << "saveLocal" << LL_ENDL; LLSnapshotLivePreview* previewp = getPreviewView(); - if (!previewp) + llassert(previewp != NULL); + if (previewp) { - llassert(previewp != NULL); - return FALSE; + previewp->saveLocal(success_cb, failure_cb); } - - return previewp->saveLocal(); } void LLFloaterSnapshotBase::postSave() |