diff options
author | Merov Linden <merov@lindenlab.com> | 2014-02-10 20:12:41 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-02-10 20:12:41 -0800 |
commit | 5c82aca9104ab7b6c7cf59d270ada25053f962cd (patch) | |
tree | 8ad6ff0d5431f122a30aa622a0a795a8a24e49e2 /indra/newview/lltracker.h | |
parent | 67393b8d26a839bf75d2630aca3fc88ee7466768 (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
Merge pull from lindenlab/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 ); |