summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-02-27 09:03:04 -0500
committerOz Linden <oz@lindenlab.com>2015-02-27 09:03:04 -0500
commit83851db09ab0fecbb6722826055a55844fd98ea6 (patch)
treeb3c73b1dec463e4d8a8a315f1d713a83e119d99b /indra/newview/app_settings
parentbdb42b4c716a374ab7a7b54a630ed5b5a481cdb2 (diff)
parentd4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff)
merge up to 3.7.25-release
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/keywords_lsl_default.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml
index 37dd2db93f..cea7a58949 100755
--- a/indra/newview/app_settings/keywords_lsl_default.xml
+++ b/indra/newview/app_settings/keywords_lsl_default.xml
@@ -10980,7 +10980,7 @@
</map>
</array>
<key>tooltip</key>
- <string>Rez directly off of a UUID if owner has dog-bit set.</string>
+ <string>Rez directly off of a UUID if owner has god-bit set.</string>
</map>
<key>llGround</key>
<map>