diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-03 16:19:47 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-03 16:19:47 -0700 |
| commit | 56c773b3bc52d72a5a7056d6eb9ce014dedbc0d8 (patch) | |
| tree | e9c39e4c9255a909ce0996b4cf228d562020fddb /indra/newview/llfloatersnapshot.cpp | |
| parent | 8779b29487dd3d18220b17be8dd501ffeabe274f (diff) | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) | |
Merge
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() |