diff options
| author | David Seikel | 2011-04-03 23:03:16 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-03 23:03:16 +1000 |
| commit | be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2 (patch) | |
| tree | 342cc5a544940b370a129dcdf93cadb2ef46f06c /linden/indra/newview/llfloaterpreference.h | |
| parent | Push some of the trivial changes from the accountList branch. (diff) | |
| parent | Changed version to Experimental 2011.04.02. (diff) | |
| download | meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.zip meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.gz meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.bz2 meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.xz | |
Merge remote-tracking branch 'jacek/exp' into exp
Conflicts:
.gitignore
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/install.xml
Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
Diffstat (limited to 'linden/indra/newview/llfloaterpreference.h')
| -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 | ||