1 files changed, 13 insertions, 9 deletions

diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 5008509..8b104a3 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -125,7 +125,7 @@ public:
         void updateSnapshot(BOOL new_snapshot);
         LLFloaterPostcard* savePostcard();
         void saveTexture();
-        void saveLocal();
+        BOOL saveLocal();
 
         static void onIdle( void* snapshot_preview );
 
@@ -381,8 +381,7 @@ void LLSnapshotLivePreview::draw()
                                 F32 shine_interp = llmin(1.f, mShineAnimTimer.getElapsedTimeF32() / SHINE_TIME);
                                 
                                 // draw "shine" effect
-                                LLGLEnable scissor_test(GL_SCISSOR_TEST);
-                                LLUI::setScissorRegionLocal(LLRect(0, mRect.getHeight(), mRect.getWidth(), 0));
+                                LLLocalClipRect clip(getLocalRect());
                                 {
                                         // draw diagonal stripe with gradient that passes over screen
                                         S32 x1 = gViewerWindow->getWindowWidth() * llround((clamp_rescale(shine_interp, 0.f, 1.f, -1.f - SHINE_WIDTH, 1.f)));
@@ -698,9 +697,9 @@ void LLSnapshotLivePreview::saveTexture()
         gViewerStats->incStat(LLViewerStats::ST_SNAPSHOT_COUNT );       
 }
 
-void LLSnapshotLivePreview::saveLocal()
+BOOL LLSnapshotLivePreview::saveLocal()
 {
-        gViewerWindow->saveImageNumbered(mRawImage);
+        return gViewerWindow->saveImageNumbered(mRawImage);
 }
 
 ///----------------------------------------------------------------------------
@@ -959,6 +958,8 @@ void LLFloaterSnapshot::Impl::onClickKeep(void* data)
         
         if (previewp)
         {
+                BOOL succeeded = TRUE; // Only used for saveLocal for now
+
                 if (previewp->getSnapshotType() == LLSnapshotLivePreview::SNAPSHOT_POSTCARD)
                 {
                         LLFloaterPostcard* floater = previewp->savePostcard();
@@ -977,21 +978,24 @@ void LLFloaterSnapshot::Impl::onClickKeep(void* data)
                 }
                 else
                 {
-                        previewp->saveLocal();
+                        succeeded = previewp->saveLocal();
                 }
 
                 if (gSavedSettings.getBOOL("CloseSnapshotOnKeep"))
                 {
                         view->close();
-                        // only plays sound and anim when keeping a snapshot, and closing the snapshot UI
-                        gViewerWindow->playSnapshotAnimAndSound();
+                        // only plays sound and anim when keeping a snapshot, and closing the snapshot UI,
+                        // and only if the save succeeded (i.e. was not canceled)
+                        if (succeeded)
+                        {
+                                gViewerWindow->playSnapshotAnimAndSound();
+                        }
                 }
                 else
                 {
                         checkAutoSnapshot(previewp);
                 }
         }
-
 }
 
 // static