diff options
| author | Armin Weatherwax | 2010-07-30 14:05:09 +0200 |
|---|---|---|
| committer | Jacek Antonelli | 2010-08-02 00:11:24 -0500 |
| commit | 000b378f59bcd8bbdb4b50e5e5b60376ba239976 (patch) | |
| tree | ef7a400fcbbaa9ec956bf672b3ca0f2d8a1ef2fc /linden/indra/newview/llvoavatar.h | |
| parent | don't show textures without fetcher in texture-console (backport from Viewer ... (diff) | |
| download | meta-impy-000b378f59bcd8bbdb4b50e5e5b60376ba239976.zip meta-impy-000b378f59bcd8bbdb4b50e5e5b60376ba239976.tar.gz meta-impy-000b378f59bcd8bbdb4b50e5e5b60376ba239976.tar.bz2 meta-impy-000b378f59bcd8bbdb4b50e5e5b60376ba239976.tar.xz | |
small show client name of others tweaking
Diffstat (limited to 'linden/indra/newview/llvoavatar.h')
| -rw-r--r-- | linden/indra/newview/llvoavatar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h index 36ed22a..0c32244 100644 --- a/linden/indra/newview/llvoavatar.h +++ b/linden/indra/newview/llvoavatar.h | |||
| @@ -658,10 +658,11 @@ private: | |||
| 658 | static LLVector3d sBeamLastAt; | 658 | static LLVector3d sBeamLastAt; |
| 659 | static LLSD sClientResolutionList; | 659 | static LLSD sClientResolutionList; |
| 660 | 660 | ||
| 661 | public: //anything against having this public? | ||
| 661 | static void resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar); | 662 | static void resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar); |
| 662 | //Imprudence FIXME | 663 | //Imprudence FIXME |
| 663 | // friend class LLFloaterAvatarList; | 664 | // friend class LLFloaterAvatarList; |
| 664 | 665 | // friend class LLHoverView; | |
| 665 | protected: | 666 | protected: |
| 666 | LLPointer<LLHUDEffectSpiral> mBeam; | 667 | LLPointer<LLHUDEffectSpiral> mBeam; |
| 667 | LLFrameTimer mBeamTimer; | 668 | LLFrameTimer mBeamTimer; |