summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-27 13:01:55 -0500
committerOz Linden <oz@lindenlab.com>2011-01-27 13:01:55 -0500
commit3ef1a5a5d2334a0cd498e959b983e0cdf626eaef (patch)
treea461ec6fc7412cff158635afffb0c4336fcac470 /indra/newview/llimview.h
parent3c1cafeac1312ec37ba80853e1b04e5768c20738 (diff)
parent3eba59e963d87f54e1b33b0a34de3fe37e67ebe1 (diff)
merge changes for beta fixes
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);