diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-14 16:59:05 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-14 16:59:05 -0700 |
commit | 22133d281d0c70f13f63d0db2083d6d3cbf002da (patch) | |
tree | 7f964f3817091833ca337c5b40a5526e0fb883dd /indra/newview/llimfloater.h | |
parent | c238027dd9917b1633ff5f16911fbdbe437f9a55 (diff) | |
parent | d34746b596bad717f7d0c10e263700738a06aa43 (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimfloater.h')
-rw-r--r-- | indra/newview/llimfloater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index b02f779637..d74b13b88d 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -138,7 +138,7 @@ private: // For display name lookups for IM window titles void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name); - bool dropPerson(LLInventoryObject* item, bool drop); + bool dropPerson(LLUUID* person_id, bool drop); BOOL isInviteAllowed() const; BOOL inviteToSession(const uuid_vec_t& agent_ids); |