summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-20 12:41:00 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-20 12:41:00 +0100
commitf33fff7e15947859f9c89cd5297971a28205bca8 (patch)
tree4abe6618d6bc69432707f23369587190d1ef544d /indra/newview/llvoavatar.h
parente275b7a658ee29ca4ce3dd77908ddd4c34749449 (diff)
parent5952fbca316ba1d1e4243bf5ebd6dc647e4957f4 (diff)
slightly hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r--indra/newview/llvoavatar.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 411ebe4121..b81725f106 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -1,6 +1,6 @@
/**
* @file llvoavatar.h
- * @brief Declaration of LLVOAvatar class which is a derivation fo
+ * @brief Declaration of LLVOAvatar class which is a derivation of
* LLViewerObject
*
* $LicenseInfo:firstyear=2001&license=viewergpl$