From ee24bbdd482f4d183b92221ebef15d9555860534 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Thu, 9 Jul 2009 22:31:17 +0000
Subject: [PATCH] DEV-34804 right click object more>attach HUD, hover and a
black bar appears
reviewed by Austni
---
indra/newview/llvoavatar.h | 2 +-
indra/newview/llvoavatarself.cpp | 8 ++++++++
indra/newview/llvoavatarself.h | 1 +
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index b22c0deb337..283b9ea1561 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -94,7 +94,7 @@ class LLVOAvatar :
virtual void markDead();
static void initClass(); // Initialize data that's only init'd once per class.
static void cleanupClass(); // Cleanup data that's only init'd once per class.
- void initInstance(); // Called after construction to initialize the class.
+ virtual void initInstance(); // Called after construction to initialize the class.
protected:
virtual ~LLVOAvatar();
BOOL loadSkeletonNode();
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index ef02b509bac..55e72cc437e 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -161,9 +161,17 @@ LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID& id,
{
mLocalTextureDatas[(ETextureIndex)i].push_back(new LocalTextureData);
}
+}
+void LLVOAvatarSelf::initInstance()
+{
BOOL status = TRUE;
+ // creates hud joint(mScreen) among other things
status &= loadAvatarSelf();
+
+ // adds attachment points to mScreen among other things
+ LLVOAvatar::initInstance();
+
status &= buildMenus();
if (!status)
{
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 02a77cba908..588e3e67d8c 100644
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -54,6 +54,7 @@ class LLVOAvatarSelf :
LLVOAvatarSelf(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
virtual ~LLVOAvatarSelf();
virtual void markDead();
+ virtual void initInstance(); // Called after construction to initialize the class.
protected:
BOOL loadAvatarSelf();
BOOL buildSkeletonSelf(const LLVOAvatarSkeletonInfo *info);
--
GitLab