diff options
author | Jonathan Yap <none@none> | 2014-03-06 09:20:54 -0500 |
---|---|---|
committer | Jonathan Yap <none@none> | 2014-03-06 09:20:54 -0500 |
commit | a0f668c0a382ad4bd7a9be703bbcf1edd2bcf460 (patch) | |
tree | 9da9b08465582432d12797951543a30d6c9fc2c1 /indra/newview/lltracker.h | |
parent | 672cc7049777b57a01a61428864ac6e3d10df321 (diff) | |
parent | a5e56067c28298b4df0ef498303f78f67c35782c (diff) |
STORM-68 merge
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 ); |