diff options
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
| -rw-r--r-- | indra/newview/llfloaterchat.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index fd428990f8..745e7766f2 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -75,8 +75,8 @@ #include "llstylemap.h" // Used for LCD display -extern void AddNewIMToLCD(const LLString &newLine); -extern void AddNewChatToLCD(const LLString &newLine); +extern void AddNewIMToLCD(const std::string &newLine); +extern void AddNewChatToLCD(const std::string &newLine); // // Constants // @@ -94,7 +94,7 @@ LLColor4 get_text_color(const LLChat& chat); // Member Functions // LLFloaterChat::LLFloaterChat(const LLSD& seed) -: LLFloater("chat floater", "FloaterChatRect", "", +: LLFloater(std::string("chat floater"), std::string("FloaterChatRect"), LLStringUtil::null, RESIZE_YES, 440, 100, DRAG_ON_TOP, MINIMIZE_NO, CLOSE_YES), mPanel(NULL) { @@ -191,7 +191,7 @@ void LLFloaterChat::updateConsoleVisibility() void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LLColor4& color) { - LLString line = chat.mText; + std::string line = chat.mText; bool prepend_newline = true; if (gSavedSettings.getBOOL("ChatShowTimestamps")) { @@ -215,13 +215,13 @@ void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LL void log_chat_text(const LLChat& chat) { - LLString histstr; + std::string histstr; if (gSavedPerAccountSettings.getBOOL("LogChatTimestamp")) histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + chat.mText; else histstr = chat.mText; - LLLogChat::saveHistory("chat",histstr); + LLLogChat::saveHistory(std::string("chat"),histstr); } // static void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file) @@ -304,7 +304,7 @@ void LLFloaterChat::onClickMute(void *data) LLComboBox* chatter_combo = self->getChild<LLComboBox>("chatter combobox"); - const LLString& name = chatter_combo->getSimple(); + const std::string& name = chatter_combo->getSimple(); LLUUID id = chatter_combo->getCurrentID(); if (name.empty()) return; @@ -459,11 +459,11 @@ LLColor4 get_text_color(const LLChat& chat) //static void LLFloaterChat::loadHistory() { - LLLogChat::loadHistory("chat", &chatFromLogFile, (void *)LLFloaterChat::getInstance(LLSD())); + LLLogChat::loadHistory(std::string("chat"), &chatFromLogFile, (void *)LLFloaterChat::getInstance(LLSD())); } //static -void LLFloaterChat::chatFromLogFile(LLLogChat::ELogLineType type , LLString line, void* userdata) +void LLFloaterChat::chatFromLogFile(LLLogChat::ELogLineType type , std::string line, void* userdata) { switch (type) { |