diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-11 08:21:39 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-11 08:21:39 -0400 |
commit | 1acae5b2915aacff7a2c7892ea2ab094b60b67c9 (patch) | |
tree | 854cd26a37b072d2a389fd9df9a992e674dae5b7 /indra/newview/llfloaterautoreplacesettings.cpp | |
parent | f363292a845e7dd73181fe4407d3dcbf9f586f9a (diff) |
fix error notices to be more prominent for invalid list names and keywords
Diffstat (limited to 'indra/newview/llfloaterautoreplacesettings.cpp')
-rw-r--r-- | indra/newview/llfloaterautoreplacesettings.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llfloaterautoreplacesettings.cpp b/indra/newview/llfloaterautoreplacesettings.cpp index 64b3b09276..1449c88820 100644 --- a/indra/newview/llfloaterautoreplacesettings.cpp +++ b/indra/newview/llfloaterautoreplacesettings.cpp @@ -550,16 +550,15 @@ void LLFloaterAutoReplaceSettings::onSaveEntry() mSettings.removeEntryFromList( mPreviousKeyword, mSelectedListName ); } - // @TODO should all these be LLWStrings ? - std::string keyword = mKeyword->getValue().asString(); - std::string replacement = mReplacement->getValue().asString(); + LLWString keyword = mKeyword->getWText(); + LLWString replacement = mReplacement->getWText(); if ( mSettings.addEntryToList(keyword, replacement, mSelectedListName) ) { // insert the new keyword->replacement pair LL_INFOS("AutoReplace") << "list '" << mSelectedListName << "' " - << "added '" << keyword - << "' -> '" << replacement + << "added '" << wstring_to_utf8str(keyword) + << "' -> '" << wstring_to_utf8str(replacement) << "'" << LL_ENDL; updateReplacementsList(); @@ -568,8 +567,8 @@ void LLFloaterAutoReplaceSettings::onSaveEntry() { LLNotificationsUtil::add("InvalidAutoReplaceEntry"); LL_WARNS("AutoReplace")<<"invalid entry " - << "keyword '" << keyword - << "' replacement '" << replacement + << "keyword '" << wstring_to_utf8str(keyword) + << "' replacement '" << wstring_to_utf8str(replacement) << "'" << LL_ENDL; } } |