diff options
| author | Jacek Antonelli | 2008-12-13 23:31:47 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-13 23:31:47 -0600 |
| commit | d389594c7cb0f4dad5076f33fb0b41ec4f93606e (patch) | |
| tree | 471a75f6455711c6f4e6ba8ec14fe27ba48d3352 /linden/indra/newview/llnetmap.h | |
| parent | Version string generator now includes test label. (diff) | |
| parent | Friends dots show as yellow and color can be set in colors.xml (diff) | |
| download | meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.zip meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.tar.gz meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.tar.bz2 meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.tar.xz | |
Merged 'mccabe/VWR-3336' into next
Conflicts:
linden/indra/newview/skins/default/colors_base.xml
linden/indra/newview/skins/silver/colors_base.xml
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llnetmap.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h index 3fb20cc..91027c5 100644 --- a/linden/indra/newview/llnetmap.h +++ b/linden/indra/newview/llnetmap.h | |||
| @@ -84,7 +84,10 @@ protected: | |||
| 84 | 84 | ||
| 85 | public: | 85 | public: |
| 86 | LLHandle<LLView> mPopupMenuHandle; | 86 | LLHandle<LLView> mPopupMenuHandle; |
| 87 | |||
| 87 | LLColor4 mBackgroundColor; | 88 | LLColor4 mBackgroundColor; |
| 89 | LLColor4 glyph_color_avatar; | ||
| 90 | LLColor4 glyph_color_friend; | ||
| 88 | 91 | ||
| 89 | F32 mScale; // Size of a region in pixels | 92 | F32 mScale; // Size of a region in pixels |
| 90 | F32 mPixelsPerMeter; // world meters to map pixels | 93 | F32 mPixelsPerMeter; // world meters to map pixels |