diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
commit | 95f859dc22724611f4a1d2dc91e0c1769ec1e632 (patch) | |
tree | 3083719871df0fa6627b7a30514bfef3ad5de816 /indra/newview/lltracker.h | |
parent | c5fff11a76613b366216bcd262dfddfd0cc2a6a3 (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
Merge with viewer-release
Diffstat (limited to 'indra/newview/lltracker.h')
-rwxr-xr-x | indra/newview/lltracker.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltracker.h b/indra/newview/lltracker.h index 8e916af315..d8d5803787 100755 --- a/indra/newview/lltracker.h +++ b/indra/newview/lltracker.h @@ -108,8 +108,10 @@ protected: LLTracker(); ~LLTracker(); + static void drawBeacon(LLVector3 pos_agent, std::string direction, LLColor4 fogged_color, F32 dist); static void renderBeacon( LLVector3d pos_global, const LLColor4& color, + const LLColor4& color_under, LLHUDText* hud_textp, const std::string& label ); |