diff options
| author | McCabe Maxsted | 2011-03-23 19:45:04 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-23 19:45:04 -0700 |
| commit | 75e6222d5fe23bfbf9a02bf4a6969ac25b8ceac1 (patch) | |
| tree | c5bd538b57712320c354f3eb1567aabbdf13f85b /linden/indra/newview/llfloaterpreference.h | |
| parent | Merge remote-tracking branch 'armin/exp' into exp (diff) | |
| download | meta-impy-75e6222d5fe23bfbf9a02bf4a6969ac25b8ceac1.zip meta-impy-75e6222d5fe23bfbf9a02bf4a6969ac25b8ceac1.tar.gz meta-impy-75e6222d5fe23bfbf9a02bf4a6969ac25b8ceac1.tar.bz2 meta-impy-75e6222d5fe23bfbf9a02bf4a6969ac25b8ceac1.tar.xz | |
Moved 'Reset all preferences to default' button to a more logical place: in the main preferences window
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llfloaterpreference.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h index 931c8b6..d5eccbc 100644 --- a/linden/indra/newview/llfloaterpreference.h +++ b/linden/indra/newview/llfloaterpreference.h | |||
| @@ -133,6 +133,9 @@ protected: | |||
| 133 | static void onBtnCancel(void*); | 133 | static void onBtnCancel(void*); |
| 134 | static void onBtnApply(void*); | 134 | static void onBtnApply(void*); |
| 135 | 135 | ||
| 136 | static void onClickResetPrefs(void* user_data); | ||
| 137 | static bool callbackReset(const LLSD& notification, const LLSD& response, LLFloaterPreference* self); | ||
| 138 | |||
| 136 | static LLFloaterPreference* sInstance; | 139 | static LLFloaterPreference* sInstance; |
| 137 | }; | 140 | }; |
| 138 | 141 | ||