diff options
author | Anders Arnholm | 2008-12-15 16:10:11 +0100 |
---|---|---|
committer | Anders Arnholm | 2008-12-15 16:10:11 +0100 |
commit | 9737c3f8cb1dd9b3bf7aacb5d9f324867916e5d3 (patch) | |
tree | d15cc55199dfa9281cf6d285900e1580aba55fad /linden/indra/newview/llfloatergroupinvite.h | |
parent | Merge branch 'next' into openal (diff) | |
parent | Not openal branch next branch. (diff) | |
download | meta-impy-9737c3f8cb1dd9b3bf7aacb5d9f324867916e5d3.zip meta-impy-9737c3f8cb1dd9b3bf7aacb5d9f324867916e5d3.tar.gz meta-impy-9737c3f8cb1dd9b3bf7aacb5d9f324867916e5d3.tar.bz2 meta-impy-9737c3f8cb1dd9b3bf7aacb5d9f324867916e5d3.tar.xz |
Merge branch 'next' into openal
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloatergroupinvite.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloatergroupinvite.h b/linden/indra/newview/llfloatergroupinvite.h index 621b5dd..96b9161 100644 --- a/linden/indra/newview/llfloatergroupinvite.h +++ b/linden/indra/newview/llfloatergroupinvite.h | |||
@@ -52,6 +52,12 @@ protected: | |||
52 | 52 | ||
53 | class impl; | 53 | class impl; |
54 | impl* mImpl; | 54 | impl* mImpl; |
55 | private: | ||
56 | static void callbackLoadGroupName(const LLUUID& id, | ||
57 | const std::string& first, | ||
58 | const std::string& last, | ||
59 | BOOL is_group, | ||
60 | void* data); | ||
55 | }; | 61 | }; |
56 | 62 | ||
57 | #endif | 63 | #endif |