diff options
author | Don Kjer <don@lindenlab.com> | 2011-01-12 19:00:36 -0800 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-01-12 19:00:36 -0800 |
commit | 756a4e26da6cec82d48a71d05b1f43623b56313d (patch) | |
tree | 4dfa615e17c7941114679643e1aa5a2875583f29 /indra/newview/llimview.h | |
parent | d8b4363c1d3f60741422419b386b79df23a6da6a (diff) | |
parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llimview.h')
-rw-r--r-- | indra/newview/llimview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index e765a8da2f..a15776c207 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -100,7 +100,7 @@ public: void onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name); - void onAdHocNameCache(const LLAvatarName& av_name);
+ void onAdHocNameCache(const LLAvatarName& av_name); //*TODO make private static std::string generateHash(const std::set<LLUUID>& sorted_uuids); |