summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-01-11 16:42:24 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-01-11 16:42:24 -0500
commit86482ce1d7dbd01e1ebad4d18565bd979a11aa30 (patch)
tree8f77212384a9302d24cde4d196e6443273ceba20 /indra/newview/llimview.h
parent997c0d3924015910b62acaa85e46844fcfb43ec0 (diff)
parent3fcdd7f41581e2e724be703687e717ea6ddc91ba (diff)
merge
Diffstat (limited to 'indra/newview/llimview.h')
-rw-r--r--indra/newview/llimview.h2
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);