diff options
| -rwxr-xr-x | indra/llui/llkeywords.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/keywords_lsl_default.xml (renamed from indra/newview/app_settings/keywords_lsl_tokens.xml) | 0 |
3 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 93e8c084e9..33a8cc947d 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -35,7 +35,6 @@ #include "lltexteditor.h" #include "llstl.h" - inline BOOL LLKeywordToken::isHead(const llwchar* s) const { // strncmp is much faster than string compare @@ -71,7 +70,7 @@ inline BOOL LLKeywordToken::isTail(const llwchar* s) const LLKeywords::LLKeywords() : mLoaded(FALSE) { - setFilenameSyntax( gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"keywords_lsl_tokens.xml") ); + setFilenameSyntax( gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"keywords_lsl_default.xml") ); } LLKeywords::~LLKeywords() diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b6618f2935..97243bc8b1 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1524,7 +1524,7 @@ set(viewer_APPSETTINGS_FILES app_settings/high_graphics.xml app_settings/ignorable_dialogs.xml app_settings/keys.xml - app_settings/keywords_lsl_tokens.xml + app_settings/keywords_lsl_default.xml app_settings/logcontrol.xml app_settings/low_graphics.xml app_settings/mid_graphics.xml diff --git a/indra/newview/app_settings/keywords_lsl_tokens.xml b/indra/newview/app_settings/keywords_lsl_default.xml index 6806f80169..6806f80169 100644 --- a/indra/newview/app_settings/keywords_lsl_tokens.xml +++ b/indra/newview/app_settings/keywords_lsl_default.xml |