diff options
author | Oz Linden <oz@lindenlab.com> | 2013-12-19 17:30:58 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-12-19 17:30:58 -0500 |
commit | 8b01fd42b0973e9aa5a68761b15a27bdab9e1797 (patch) | |
tree | 6c567aa0d7dab5fc1b717d3e6e793358572a7094 /indra/newview/lltracker.h | |
parent | 9f056c1ddd46aeab83677bca81dba7c8bcb51f99 (diff) | |
parent | e774431783fba010b1ea1daaf4df25ccf292833e (diff) |
merge changes from project qa viewer
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 ); |