diff options
| author | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
| commit | e4b0e7c82d670081c071d8a3da31b5ec407b8e07 (patch) | |
| tree | 9410962bbb582eedbec448139e217f2714050777 /linden/indra/newview/llpanelgeneral.h | |
| parent | Started 1.3.0 branch (diff) | |
| parent | Updated and added some Linux libs. (diff) | |
| download | meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.zip meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.gz meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.bz2 meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.xz | |
Merged working branch of 1.2 into LL 1.23 merge
Diffstat (limited to 'linden/indra/newview/llpanelgeneral.h')
| -rw-r--r-- | linden/indra/newview/llpanelgeneral.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h index 4afa5dd..c5a1f63 100644 --- a/linden/indra/newview/llpanelgeneral.h +++ b/linden/indra/newview/llpanelgeneral.h | |||
| @@ -46,6 +46,9 @@ public: | |||
| 46 | 46 | ||
| 47 | void apply(); | 47 | void apply(); |
| 48 | void cancel(); | 48 | void cancel(); |
| 49 | |||
| 50 | private: | ||
| 51 | static void onClickResetUISize(void*); | ||
| 49 | }; | 52 | }; |
| 50 | 53 | ||
| 51 | #endif | 54 | #endif |