diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-04 13:15:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-04 13:15:43 -0500 |
| commit | a373a7442c244712ab17d793072699ef82684816 (patch) | |
| tree | 2ed20e24993c4bfbb4f943ed7794fcd06eeb8a23 /indra/newview/lltracker.h | |
| parent | b0c255f4e6141246f3575cb3d5b671af19966de9 (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 ); |