diff options
| author | Jacek Antonelli | 2008-10-03 02:21:33 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-03 15:27:46 -0500 |
| commit | f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6 (patch) | |
| tree | 3e6c0dd5415915a14b5cd00747f4615d9f506570 /linden/indra/newview/llimpanel.h | |
| parent | Added .gitignore to ignore artwork, libs, and compiled stuff. (diff) | |
| parent | 'Offer Teleport' button in friends list is now enabled (diff) | |
| download | meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.zip meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.tar.gz meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.tar.bz2 meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.tar.xz | |
Merge branch 'offer-teleport' 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 974fc4d..5bac0bd 100644 --- a/linden/indra/newview/llimpanel.h +++ b/linden/indra/newview/llimpanel.h | |||
| @@ -231,6 +231,7 @@ public: | |||
| 231 | 231 | ||
| 232 | static void onClickProfile( void* userdata ); | 232 | static void onClickProfile( void* userdata ); |
| 233 | static void onClickGroupInfo( void* userdata ); | 233 | static void onClickGroupInfo( void* userdata ); |
| 234 | static void onClickOfferTeleport( void* userdata ); | ||
| 234 | static void onClickClose( void* userdata ); | 235 | static void onClickClose( void* userdata ); |
| 235 | static void onClickStartCall( void* userdata ); | 236 | static void onClickStartCall( void* userdata ); |
| 236 | static void onClickEndCall( void* userdata ); | 237 | static void onClickEndCall( void* userdata ); |