diff options
| author | Richard Nelson <richard@lindenlab.com> | 2009-07-09 22:31:17 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2009-07-09 22:31:17 +0000 |
| commit | ee24bbdd482f4d183b92221ebef15d9555860534 (patch) | |
| tree | 3dc83686097d84e374482f14129ebf3e7ecd8545 | |
| parent | 8016e73cc0a2a27062fae27e609535e002eef362 (diff) | |
DEV-34804 right click object more>attach HUD, hover and a black bar appears
reviewed by Austni
| -rw-r--r-- | indra/newview/llvoavatar.h | 2 | ||||
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llvoavatarself.h | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index b22c0deb33..283b9ea156 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -94,7 +94,7 @@ public: 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 ef02b509ba..55e72cc437 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 02a77cba90..588e3e67d8 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -54,6 +54,7 @@ public: 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); |