diff options
author | Tofu Buzzard <no-email> | 2010-11-09 10:05:17 +0000 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2010-11-09 10:05:17 +0000 |
commit | caa53cc8cdd69bd48bd6c07fa6c98234e81f8a42 (patch) | |
tree | 682c2571bad71cf52e5157f4703163ca2ce21f57 /indra/newview/llimview.h | |
parent | 179e9e37ecbdcd1ad2133733047707ddd42e8c30 (diff) | |
parent | b657516f72f016a918e0ff627105dd380a94394c (diff) |
merge up from v-d
Diffstat (limited to 'indra/newview/llimview.h')
-rw-r--r-- | indra/newview/llimview.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 3da4465862..650d329e18 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -100,6 +100,8 @@ public: void onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name); + void onAdHocNameCache(const LLAvatarName& av_name);
+ //*TODO make private static std::string generateHash(const std::set<LLUUID>& sorted_uuids); |