diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
| commit | 93b1111507f5e5c812b6a9e8e47bdf7db67931a0 (patch) | |
| tree | 214b852c8451409d5d355437ddad48199bef976a /indra/newview/llautoreplace.cpp | |
| parent | 03cc47698489929b66fbceb139e4c95d13392b9d (diff) | |
| parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) | |
Merge with viewer-bear
Diffstat (limited to 'indra/newview/llautoreplace.cpp')
| -rwxr-xr-x | indra/newview/llautoreplace.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llautoreplace.cpp b/indra/newview/llautoreplace.cpp index 1d72397cbc..dd9354fe3a 100755 --- a/indra/newview/llautoreplace.cpp +++ b/indra/newview/llautoreplace.cpp @@ -39,7 +39,7 @@ void LLAutoReplace::autoreplaceCallback(S32& replacement_start, S32& replacement replacement_length = 0; replacement_string.clear(); - static LLCachedControl<bool> perform_autoreplace(gSavedSettings, "AutoReplace"); + static LLCachedControl<bool> perform_autoreplace(gSavedSettings, "AutoReplace", 0); if (perform_autoreplace) { S32 word_end = cursor_pos - 1; @@ -679,7 +679,7 @@ bool LLAutoReplaceSettings::decreaseListPriority(std::string listName) std::string LLAutoReplaceSettings::replaceWord(const std::string currentWord) { std::string returnedWord = currentWord; // in case no replacement is found - static LLCachedControl<bool> autoreplace_enabled(gSavedSettings, "AutoReplace"); + static LLCachedControl<bool> autoreplace_enabled(gSavedSettings, "AutoReplace", false); if ( autoreplace_enabled ) { LL_DEBUGS("AutoReplace")<<"checking '"<<currentWord<<"'"<< LL_ENDL; |
