diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-06 15:40:48 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-06 15:40:48 -0800 |
| commit | 8d3f9a275fb34e283328bd9e51033d47221f699a (patch) | |
| tree | c51922f2848f48aa624d252c99454f3b27197a86 /indra | |
| parent | 395ed1fc8d4380e4ad3295add4bf0653641259fb (diff) | |
| parent | 894db03cfd4fc1720c643db14652a16d86d1ab90 (diff) | |
STORM-378 : pull into viewer-beta
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index cad54cd158..1aba5ef92f 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -908,6 +908,8 @@ BOOL LLSnapshotLivePreview::onIdle( void* snapshot_preview ) previewp->mPosTakenGlobal = gAgentCamera.getCameraPositionGlobal(); previewp->mShineCountdown = 4; // wait a few frames to avoid animation glitch due to readback this frame } + + gViewerWindow->playSnapshotAnimAndSound(); } previewp->getWindow()->decBusyCount(); // only show fullscreen preview when in freeze frame mode @@ -1533,8 +1535,6 @@ void LLFloaterSnapshot::Impl::onClickNewSnapshot(void* data) if (previewp && view) { previewp->updateSnapshot(TRUE); - - gViewerWindow->playSnapshotAnimAndSound(); } } @@ -2206,8 +2206,6 @@ void LLFloaterSnapshot::onOpen(const LLSD& key) gSnapshotFloaterView->setEnabled(TRUE); gSnapshotFloaterView->setVisible(TRUE); gSnapshotFloaterView->adjustToFitScreen(this, FALSE); - - gViewerWindow->playSnapshotAnimAndSound(); } void LLFloaterSnapshot::onClose(bool app_quitting) |