diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:36:34 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:36:34 -0500 |
| commit | a5e56067c28298b4df0ef498303f78f67c35782c (patch) | |
| tree | ec5cf26d0eb8825a6d30fcf325e4862ddc353890 /indra/newview/lltracker.h | |
| parent | 197db4976ad8df958b7b2c59a66498398cfd0665 (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
merge changes for 3.7.2-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 ); |