aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloateravatarinfo.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloateravatarinfo.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloateravatarinfo.h b/linden/indra/newview/llfloateravatarinfo.h
index c8c5fe9..67cdb7a 100644
--- a/linden/indra/newview/llfloateravatarinfo.h
+++ b/linden/indra/newview/llfloateravatarinfo.h
@@ -12,12 +12,12 @@
12 * ("GPL"), unless you have obtained a separate licensing agreement 12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of 13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or 14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlife.com/developers/opensource/gplv2 15 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
16 * 16 *
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlife.com/developers/opensource/flossexception 20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 21 *
22 * By copying, modifying or distributing this software, you acknowledge 22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 23 * that you have read and understood your obligations described above,
@@ -84,7 +84,9 @@ public:
84 84
85 static void showFromDirectory(const LLUUID &avatar_id); 85 static void showFromDirectory(const LLUUID &avatar_id);
86 86
87 static void showFromFriend(const LLUUID& agent_id, BOOL online); 87 static void showFromFriend(const LLUUID &agent_id, BOOL online);
88
89 static void showFromProfile(const LLUUID &avatar_id, LLRect rect);
88 90
89 static LLFloaterAvatarInfo* getInstance(const LLUUID &id); 91 static LLFloaterAvatarInfo* getInstance(const LLUUID &id);
90 static void showProfileCallback(S32 option, void *userdata); 92 static void showProfileCallback(S32 option, void *userdata);