diff options
Diffstat (limited to 'linden/indra/llui/llkeywords.h')
-rw-r--r-- | linden/indra/llui/llkeywords.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llui/llkeywords.h b/linden/indra/llui/llkeywords.h index e6ff029..d5d7302 100644 --- a/linden/indra/llui/llkeywords.h +++ b/linden/indra/llui/llkeywords.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -84,7 +84,7 @@ public: | |||
84 | BOOL loadFromFile(const LLString& filename); | 84 | BOOL loadFromFile(const LLString& filename); |
85 | BOOL isLoaded() { return mLoaded; } | 85 | BOOL isLoaded() { return mLoaded; } |
86 | 86 | ||
87 | void findSegments(std::vector<LLTextSegment *> *seg_list, const LLWString& text ); | 87 | void findSegments(std::vector<LLTextSegment *> *seg_list, const LLWString& text, const LLColor4 &defaultColor ); |
88 | 88 | ||
89 | #ifdef _DEBUG | 89 | #ifdef _DEBUG |
90 | void dump(); | 90 | void dump(); |
@@ -98,7 +98,7 @@ public: | |||
98 | 98 | ||
99 | private: | 99 | private: |
100 | LLColor3 readColor(const LLString& s); | 100 | LLColor3 readColor(const LLString& s); |
101 | void insertSegment(std::vector<LLTextSegment *> *seg_list, LLTextSegment* new_segment, S32 text_len); | 101 | void insertSegment(std::vector<LLTextSegment *> *seg_list, LLTextSegment* new_segment, S32 text_len, const LLColor4 &defaultColor); |
102 | 102 | ||
103 | private: | 103 | private: |
104 | BOOL mLoaded; | 104 | BOOL mLoaded; |