From 66a0a02c0dd4138cd64a59c8a693b437e959a6e4 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 5 Aug 2013 16:43:11 +0200
Subject: [PATCH] FIRE-1238: Firestorm-specific preference settings need to be
 aware of the "cancel" button

---
 indra/newview/fspanelprefs.cpp | 5 +++--
 indra/newview/fspanelprefs.h   | 3 ---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/indra/newview/fspanelprefs.cpp b/indra/newview/fspanelprefs.cpp
index 3bff723faf..e7657d73b3 100644
--- a/indra/newview/fspanelprefs.cpp
+++ b/indra/newview/fspanelprefs.cpp
@@ -26,7 +26,6 @@ PanelPreferenceFirestorm::PanelPreferenceFirestorm() : LLPanelPreference()
 
 BOOL PanelPreferenceFirestorm::postBuild()
 {
-	
 	// LGG's Color Beams
 	refreshBeamLists();
 
@@ -46,16 +45,18 @@ BOOL PanelPreferenceFirestorm::postBuild()
 	tex_ctrl->setCommitCallback(boost::bind(&PanelPreferenceFirestorm::onCommitTexture, this, _2));
 	tex_ctrl->setDefaultImageAssetID(LLUUID(gSavedSettings.getString("DefaultObjectTexture")));
 
-	return LLPanelPreference::postBuild();	
+	return LLPanelPreference::postBuild();
 }
 
 void PanelPreferenceFirestorm::apply()
 {
+	LLPanelPreference::apply();
 }
 
 
 void PanelPreferenceFirestorm::cancel()
 {
+	LLPanelPreference::cancel();
 }
 
 
diff --git a/indra/newview/fspanelprefs.h b/indra/newview/fspanelprefs.h
index ac893fb3dc..b59edbd697 100644
--- a/indra/newview/fspanelprefs.h
+++ b/indra/newview/fspanelprefs.h
@@ -4,9 +4,6 @@
 #define FS_PANELPREFS_H
 
 #include "llfloaterpreference.h"
-#include "lllineeditor.h"
-
-class LLLineEditor;
 
 class PanelPreferenceFirestorm : public LLPanelPreference
 {