From 13c391f1984bb8cb9d67a7729af2ee5714409215 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 14 Sep 2007 21:13:20 +0000
Subject: EFFECTIVE MERGE: svn merge -r 68118:68999
 svn+ssh://svn/svn/linden/branches/maintenance

ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
---
 indra/newview/llviewermenufile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewermenufile.cpp')

diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 9d8a4b0026..38c6e22b7b 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -379,7 +379,7 @@ class LLFileTakeSnapshotToDisk : public view_listener_t
 									   gSavedSettings.getBOOL("RenderUIInSnapshot"),
 									   FALSE))
 		{
-			if (!gQuietSnapshot)
+			if (!gSavedSettings.getBOOL("QuietSnapshotsToDisk"))
 			{
 				gViewerWindow->playSnapshotAnimAndSound();
 			}
-- 
cgit v1.2.3