diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-10-29 13:14:34 -0700 | 
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-10-29 13:14:34 -0700 | 
| commit | f34683dcdedb4f0ba0799ffb6382960a8a73403d (patch) | |
| tree | 3e3ba11ab6d4ccf4564bca5e53dc6e22dd578584 /indra | |
| parent | a965b7f74bfdb4c31591b99e10c4536b5e754dd7 (diff) | |
DN-192 [crashhunters] LLVOAvatar::clearNameTag
DN-193[crashhunters] LLHudNameTag::setLabel
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoavatar.h | 5 | 
1 files changed, 4 insertions, 1 deletions
| diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index f4f1235d55..a779a1735c 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -33,6 +33,8 @@  #include <string>  #include <vector> +#include <boost/signals2.hpp> +  #include "imageids.h"			// IMG_INVISIBLE  #include "llchat.h"  #include "lldrawpoolalpha.h" @@ -71,7 +73,8 @@ class LLVOAvatarSkeletonInfo;  //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~  class LLVOAvatar :  	public LLViewerObject, -	public LLCharacter +	public LLCharacter, +	public boost::signals2::trackable  {  public:  	friend class LLVOAvatarSelf; | 
