From 6e8cd5a4ccb7dcc6a76acf0466679123c4330d30 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Sat, 27 Dec 2014 13:11:11 -0500
Subject: [PATCH] Bug fixy ~ Reset Ambient Occlusion setting on cancel

Thanks to Cale Flanagan for finding this one.
---
 indra/newview/llpaneldisplay.cpp | 2 ++
 indra/newview/llpaneldisplay.h   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp
index 1d4e23ded..1f979caab 100644
--- a/indra/newview/llpaneldisplay.cpp
+++ b/indra/newview/llpaneldisplay.cpp
@@ -407,6 +407,7 @@ void LLPanelDisplay::refresh()
 	mAvatarVP = gSavedSettings.getBOOL("RenderAvatarVP");
 	mDeferred = gSavedSettings.getBOOL("RenderDeferred");
 	mDeferredDoF = gSavedSettings.getBOOL("RenderDepthOfField");
+	mDeferredSSAO = gSavedSettings.getBOOL("RenderDeferredSSAO");
 
 	// combo boxes
 	mReflectionDetail = gSavedSettings.getS32("RenderReflectionDetail");
@@ -672,6 +673,7 @@ void LLPanelDisplay::cancel()
 	gSavedSettings.setBOOL("RenderAvatarVP", mAvatarVP);
 	gSavedSettings.setBOOL("RenderDeferred", mDeferred);
 	gSavedSettings.setBOOL("RenderDepthOfField", mDeferredDoF);
+	gSavedSettings.setBOOL("RenderDeferredSSAO", mDeferredSSAO);
 
 	gSavedSettings.setS32("RenderReflectionDetail", mReflectionDetail);
 	gSavedSettings.setS32("RenderShadowDetail", mShadowDetail);
diff --git a/indra/newview/llpaneldisplay.h b/indra/newview/llpaneldisplay.h
index 688757f9a..3c91d665d 100644
--- a/indra/newview/llpaneldisplay.h
+++ b/indra/newview/llpaneldisplay.h
@@ -125,6 +125,7 @@ protected:
 	BOOL mWindLight;
 	BOOL mDeferred;
 	BOOL mDeferredDoF;
+	bool mDeferredSSAO;
 	BOOL mAvatarVP;
 
 	S32 mReflectionDetail;