diff options
| author | Kyle Ambroff <ambroff@lindenlab.com> | 2010-11-15 14:14:00 -0800 |
|---|---|---|
| committer | Kyle Ambroff <ambroff@lindenlab.com> | 2010-11-15 14:14:00 -0800 |
| commit | ed9af1151fea725574ddedafd75a9ecfb5927082 (patch) | |
| tree | 6fb865d740e84865b439d224043a5de7151765c8 /indra/newview/llimview.h | |
| parent | 0dbf75ab657446b51e6e9795ddccc16bb9f6fd02 (diff) | |
| parent | a9eb639511a09dc072e67e10d8885a0b4f7587da (diff) | |
Merge with lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 3da4465862..3f72d66bfb 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -62,7 +62,7 @@ class LLIMModel : public LLSingleton<LLIMModel> { public: - struct LLIMSession + struct LLIMSession : public boost::signals2::trackable { typedef enum e_session_type { // for now we have 4 predefined types for a session @@ -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); |