diff options
| author | Jacek Antonelli | 2009-10-13 20:20:37 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-10-13 20:20:37 -0500 |
| commit | 20235c92e6e0deddf3c8582bbed75361e24ecc0d (patch) | |
| tree | 754db362c0ad8060ceaa3ed24059e320f4b13f5c /linden/indra/newview/llimpanel.h | |
| parent | Merge remote branch 'mccabe/next' into next (diff) | |
| parent | Added history button for group chat as well (diff) | |
| download | meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.zip meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.gz meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.bz2 meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.xz | |
Merge remote branch 'mccabe/next' into next
Diffstat (limited to 'linden/indra/newview/llimpanel.h')
| -rw-r--r-- | linden/indra/newview/llimpanel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h index 0f9c0f3..0699b12 100644 --- a/linden/indra/newview/llimpanel.h +++ b/linden/indra/newview/llimpanel.h | |||
| @@ -230,6 +230,7 @@ public: | |||
| 230 | static void onTabClick( void* userdata ); | 230 | static void onTabClick( void* userdata ); |
| 231 | 231 | ||
| 232 | static void onClickProfile( void* userdata ); | 232 | static void onClickProfile( void* userdata ); |
| 233 | static void onClickHistory( void* userdata ); | ||
| 233 | static void onClickGroupInfo( void* userdata ); | 234 | static void onClickGroupInfo( void* userdata ); |
| 234 | static void onClickOfferTeleport( void* userdata ); | 235 | static void onClickOfferTeleport( void* userdata ); |
| 235 | static void onClickClose( void* userdata ); | 236 | static void onClickClose( void* userdata ); |