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/llworldmapview.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 'linden/indra/newview/llworldmapview.h')
| -rw-r--r-- | linden/indra/newview/llworldmapview.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h index 915a196..53f0bdd 100644 --- a/linden/indra/newview/llworldmapview.h +++ b/linden/indra/newview/llworldmapview.h | |||
| @@ -189,6 +189,8 @@ public: | |||
| 189 | handle_list_t mVisibleRegions; // set every frame | 189 | handle_list_t mVisibleRegions; // set every frame |
| 190 | 190 | ||
| 191 | static std::map<std::string,std::string> sStringsMap; | 191 | static std::map<std::string,std::string> sStringsMap; |
| 192 | |||
| 193 | LLColor4 glyph_color_avatar; | ||
| 192 | }; | 194 | }; |
| 193 | 195 | ||
| 194 | #endif | 196 | #endif |