diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:48 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:48 -0500 |
| commit | 0a873715677ef3fb28e8dab161acbe05ed8bd537 (patch) | |
| tree | 1f2e2c804bb7764bddbcb428c71edbcdeeb3da6f /indra/newview/llworldmapview.h | |
| parent | 11c6654479a299549dc0035faa894678a60e157e (diff) | |
| parent | eb7e48fc9015266fd2945873f12d925ffc6262ed (diff) | |
merge changes for vmrg-230
Diffstat (limited to 'indra/newview/llworldmapview.h')
| -rw-r--r-- | indra/newview/llworldmapview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llworldmapview.h b/indra/newview/llworldmapview.h index 9ab53b1ba3..a2a6dc53fb 100644 --- a/indra/newview/llworldmapview.h +++ b/indra/newview/llworldmapview.h @@ -112,7 +112,8 @@ public: F32 y_pixels, const LLColor4& color, F32 relative_z = 0.f, - F32 dot_radius = 3.f); + F32 dot_radius = 3.f, + bool reached_max_z = false); static void drawIconName(F32 x_pixels, F32 y_pixels, const LLColor4& color, @@ -138,6 +139,7 @@ public: static LLUIImagePtr sAvatarLevelImage; static LLUIImagePtr sAvatarAboveImage; static LLUIImagePtr sAvatarBelowImage; + static LLUIImagePtr sAvatarUnknownImage; static LLUIImagePtr sTelehubImage; static LLUIImagePtr sInfohubImage; |