diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-06 15:48:17 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-06 15:48:17 -0500 |
| commit | 5b8bcee234dace3af19d86472f49f81bc765db72 (patch) | |
| tree | 4d4c54544d7b20ddcb342434d0f4c886b8511554 /indra/newview/llworldmapview.h | |
| parent | 234fe401eceac95048875c1aba8cce15e64f4364 (diff) | |
| parent | acb1df8b856f49b970a5756bbed24cafad127df8 (diff) | |
merge changes for storm-1793
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; |