diff options
| author | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
| commit | cd2b97b3e6446449443700ae9a1521c402c93850 (patch) | |
| tree | 0c45e5a05cdcb6956fb859c9fef834a5c5613a04 /linden/indra/newview/llpanelavatar.h | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | Display selected avatars larger than normal, zoom in at a reasonable speed. I... (diff) | |
| download | meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.zip meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.gz meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.bz2 meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Conflicts:
linden/indra/newview/llfloaterchat.cpp
linden/indra/newview/llfloatermap.cpp
linden/indra/newview/llinventorybridge.cpp
linden/indra/newview/llnetmap.cpp
linden/indra/newview/llviewermessage.cpp
linden/indra/newview/llviewerobjectlist.cpp
Diffstat (limited to 'linden/indra/newview/llpanelavatar.h')
| -rw-r--r-- | linden/indra/newview/llpanelavatar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h index 4570145..b1bb317 100644 --- a/linden/indra/newview/llpanelavatar.h +++ b/linden/indra/newview/llpanelavatar.h | |||
| @@ -311,6 +311,7 @@ public: | |||
| 311 | 311 | ||
| 312 | static void onClickTrack( void *userdata); | 312 | static void onClickTrack( void *userdata); |
| 313 | static void onClickIM( void *userdata); | 313 | static void onClickIM( void *userdata); |
| 314 | static void onClickGroupInvite( void *userdata); | ||
| 314 | static void onClickOfferTeleport( void *userdata); | 315 | static void onClickOfferTeleport( void *userdata); |
| 315 | static void onClickPay( void *userdata); | 316 | static void onClickPay( void *userdata); |
| 316 | static void onClickAddFriend(void* userdata); | 317 | static void onClickAddFriend(void* userdata); |