diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-16 16:12:16 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-16 16:12:16 +0300 |
| commit | fb11213c04269ee35c32d35cfeaafb035b0b321f (patch) | |
| tree | fbb7310e91b9708cdb81cb929f73ab599ca9dc53 /indra/newview/llvoavatar.cpp | |
| parent | 6b0de5a0007fc038021155146d11480215fd472d (diff) | |
| parent | ed621a6ef02c4699404e8072d83c44b359bfcd24 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 6392aad248..455900eb3a 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2753,7 +2753,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) { // update chat bubble //-------------------------------------------------------------------- - // draw text label over characters head + // draw text label over character's head //-------------------------------------------------------------------- if (mChatTimer.getElapsedTimeF32() > BUBBLE_CHAT_TIME) { @@ -5553,6 +5553,7 @@ BOOL LLVOAvatar::setParent(LLViewerObject* parent) void LLVOAvatar::addChild(LLViewerObject *childp) { + childp->extractAttachmentItemID(); // find the inventory item this object is associated with. LLViewerObject::addChild(childp); if (childp->mDrawable) { |