summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-10-08 02:35:22 +0100
committerIma Mechanique <ima.mechanique@secondlife.com>2013-10-08 02:35:22 +0100
commit14ab94255642dd967e833904aaab6fda5723daa9 (patch)
tree6e500751f05c7ee59379ca0f9bbcc2a352f4e1c0 /indra/newview
parent0c1d6d7d9e89a6d3169621157bcba335ead477a9 (diff)
Renaming file to better reflect its purpose in future.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/CMakeLists.txt2
-rw-r--r--indra/newview/app_settings/keywords_lsl_default.xml (renamed from indra/newview/app_settings/keywords_lsl_tokens.xml)0
2 files changed, 1 insertions, 1 deletions
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