diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-27 19:04:26 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 19:04:26 -0500 |
| commit | ee2678be57668844221a462ed1e215c3c7cbd841 (patch) | |
| tree | 5c88a0e1609b13eb5c843c50a323a39b00ff89b7 /indra/newview/llimview.h | |
| parent | 7b7e9b0d0bd9c35acb346ae359f9a08a48b248a2 (diff) | |
| parent | 1e346e085d9af460657342f20d8fde45b6982913 (diff) | |
merge beta tags
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); |