From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 6 Sep 2008 18:24:57 -0500 Subject: Second Life viewer sources 1.21.0-RC --- linden/indra/llui/llkeywords.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'linden/indra/llui/llkeywords.h') diff --git a/linden/indra/llui/llkeywords.h b/linden/indra/llui/llkeywords.h index 61c3c57..e3361f6 100644 --- a/linden/indra/llui/llkeywords.h +++ b/linden/indra/llui/llkeywords.h @@ -80,16 +80,16 @@ public: LLKeywords(); ~LLKeywords(); - BOOL loadFromFile(const LLString& filename); + BOOL loadFromFile(const std::string& filename); BOOL isLoaded() const { return mLoaded; } void findSegments(std::vector *seg_list, const LLWString& text, const LLColor4 &defaultColor ); // Add the token as described void addToken(LLKeywordToken::TOKEN_TYPE type, - const LLString& key, + const std::string& key, const LLColor3& color, - const LLString& tool_tip = LLString::null); + const std::string& tool_tip = LLStringUtil::null); typedef std::map word_token_map_t; typedef word_token_map_t::const_iterator keyword_iterator_t; @@ -101,7 +101,7 @@ public: #endif private: - LLColor3 readColor(const LLString& s); + LLColor3 readColor(const std::string& s); void insertSegment(std::vector *seg_list, LLTextSegment* new_segment, S32 text_len, const LLColor4 &defaultColor); BOOL mLoaded; -- cgit v1.1