diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-12-12 15:51:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-12-12 15:51:43 -0500 |
| commit | dec487cd7f04f00d4aa6428d190ffbf978ea57da (patch) | |
| tree | d96cda0e2f03c1cf5b1f7ffcdd564690e0ab2cad /indra/newview/llautoreplace.cpp | |
| parent | c9775dde6249582f0e8976be15e72bfebc4ac3fc (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
merge changes for 3.6.12-release
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; |