diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-09 23:12:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-09 23:12:16 -0500 |
| commit | 6fb7c6b43cfbe4cc56c8123780a8272ca06222a1 (patch) | |
| tree | 78caf775d7c06469bc93f15564b93fd04d78bfa6 /indra/newview/llfloaterpreference.h | |
| parent | 27fd7fdee6e80aa3520d5740d0197c64ad3837e9 (diff) | |
| parent | b6f6eeb02e2eae93f2de2bd3224e33cbbb0e8c8a (diff) | |
Merged in andreyl_productengine/391-blizzard-marchcat (pull request #23)
MAINT-6174 FIXED Graphics parameters are wrong after closing the Advanced Graphics floater
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 8de65b733b..ed692c903e 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -125,12 +125,10 @@ protected: // updates click/double-click action controls depending on values from settings.xml void updateClickActionControls(); +public: // This function squirrels away the current values of the controls so that // cancel() can restore them. void saveSettings(); - - -public: void setCacheLocation(const LLStringExplicit& location); |