diff options
| author | Jacek Antonelli | 2008-09-22 14:54:55 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-22 14:54:55 -0500 |
| commit | aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7 (patch) | |
| tree | db867cf6defce8d965b244c1445bb2e983c317b1 /linden/indra/newview/llimpanel.h | |
| parent | Merge branch 'land-tools' into next-merge (diff) | |
| parent | VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button. (diff) | |
| download | meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.zip meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.tar.gz meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.tar.bz2 meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.tar.xz | |
Merge branch 'VWR-2072' into next-merge
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 2ed866b..e544154 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 ); |