diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-07 16:45:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-07 16:45:04 -0500 |
| commit | 964e981458234aed37252a7b484f6f6765fff50d (patch) | |
| tree | c58b4f05fb0ab38194c4f07f2c55257b79381bde /indra/newview/llimview.h | |
| parent | 8cfea0bab14afc29887de4b61350e6268b793622 (diff) | |
| parent | 8a939212f4afef41c83cc35a14d7f2c2ee3ce6ba (diff) | |
merge changes for vwr-1095
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); |