3 files changed, 36 insertions, 10 deletions
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
index 035eb307c2..62d7efc8b2 100755
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ b/indra/newview/llfloaterhardwaresettings.cpp
@@ -82,6 +82,7 @@ void LLFloaterHardwareSettings::refresh()
 	mVideoCardMem = gSavedSettings.getS32("TextureMemory");
 	mFogRatio = gSavedSettings.getF32("RenderFogRatio");
 	mProbeHardwareOnStartup = gSavedSettings.getBOOL("ProbeHardwareOnStartup");
+	mCompressTextures = gSavedSettings.getBOOL("RenderCompressTextures");
 
 	getChild<LLUICtrl>("fsaa")->setValue((LLSD::Integer) mFSAASamples);
 	refreshEnabledState();
@@ -149,6 +150,7 @@ void LLFloaterHardwareSettings::refreshEnabledState()
 BOOL LLFloaterHardwareSettings::postBuild()
 {
 	childSetAction("OK", onBtnOK, this);
+	childSetAction("Cancel", onBtnCancel, this);
 
 // Don't do this on Mac as their braindead GL versioning
 // sets this when 8x and 16x are indeed available
@@ -179,18 +181,17 @@ void LLFloaterHardwareSettings::apply()
 
 void LLFloaterHardwareSettings::cancel()
 {
-	gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
-	gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
-	gSavedSettings.setU32("RenderFSAASamples", mFSAASamples);
-	gSavedSettings.setF32("RenderGamma", mGamma);
-	gSavedSettings.setS32("TextureMemory", mVideoCardMem);
-	gSavedSettings.setF32("RenderFogRatio", mFogRatio);
-	gSavedSettings.setBOOL("ProbeHardwareOnStartup", mProbeHardwareOnStartup );
-
 	closeFloater();
 }
 
 // static 
+void LLFloaterHardwareSettings::onBtnCancel( void* userdata )
+{
+	LLFloaterHardwareSettings *fp =(LLFloaterHardwareSettings *)userdata;
+	fp->cancel();
+}
+
+// static
 void LLFloaterHardwareSettings::onBtnOK( void* userdata )
 {
 	LLFloaterHardwareSettings *fp =(LLFloaterHardwareSettings *)userdata;
@@ -198,4 +199,14 @@ void LLFloaterHardwareSettings::onBtnOK( void* userdata )
 	fp->closeFloater(false);
 }
 
-
+void LLFloaterHardwareSettings::onClose(bool app_quitting)
+{
+	gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
+	gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
+	gSavedSettings.setU32("RenderFSAASamples", mFSAASamples);
+	gSavedSettings.setF32("RenderGamma", mGamma);
+	gSavedSettings.setS32("TextureMemory", mVideoCardMem);
+	gSavedSettings.setF32("RenderFogRatio", mFogRatio);
+	gSavedSettings.setBOOL("ProbeHardwareOnStartup", mProbeHardwareOnStartup );
+	gSavedSettings.setBOOL("RenderCompressTextures", mCompressTextures );
+}
diff --git a/indra/newview/llfloaterhardwaresettings.h b/indra/newview/llfloaterhardwaresettings.h
index 626771b1d2..11c27c266d 100755
--- a/indra/newview/llfloaterhardwaresettings.h
+++ b/indra/newview/llfloaterhardwaresettings.h
@@ -40,6 +40,7 @@ public:
 	/*virtual*/ ~LLFloaterHardwareSettings();
 	
 	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void onClose(bool app_quitting);
 
 	/// initialize all the callbacks for the menu
 	void initCallbacks(void);
@@ -47,6 +48,9 @@ public:
 	/// OK button
 	static void onBtnOK( void* userdata );
 	
+	/// Cancel button
+	static void onBtnCancel( void* userdata );
+
 	//// menu management
 
 	/// show off our menu
@@ -76,6 +80,7 @@ protected:
 	S32 mVideoCardMem;
 	F32 mFogRatio;
 	BOOL mProbeHardwareOnStartup;
+	BOOL mCompressTextures;
 
 private:
 };
diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index 9deb0d2030..dcd6d98581 100755
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -191,8 +191,18 @@
      label="OK"
      label_selected="OK"
      layout="topleft"
-     left="-102"
+     right="-105"
      name="OK"
      top="192"
      width="90" />
+    <button
+     follows="right|bottom"
+     height="22"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="Cancel"
+     right="-10"
+     width="90" />
 </floater>