livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-1238: Firestorm-specific preference settings need to be aware of the "cancel" button

master
Ansariel 2013-08-05 16:43:11 +02:00
parent c9082bbcc1
commit 66a0a02c0d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/fspanelprefs.cpp
View File

@ -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();
}

3
indra/newview/fspanelprefs.h
View File

@ -4,9 +4,6 @@
#define FS_PANELPREFS_H
#include "llfloaterpreference.h"
#include "lllineeditor.h"
class LLLineEditor;
class PanelPreferenceFirestorm : public LLPanelPreference
{