diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-11-08 12:57:26 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-11-08 12:57:26 -0500 |
commit | a5e63b1dc0ce6c706de46dfea10784838e2d0257 (patch) | |
tree | 15c7d26720fe56bfc6adf796b20af4e3a5e94110 /indra/newview/llimview.h | |
parent | b3ab10923d74e64e543b15d773639a856f9989e7 (diff) | |
parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) |
Merge
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); |