diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/newview/llworldmapview.h | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
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 |