summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSoft Linden <soft@lindenlab.com>2009-11-03 15:49:33 -0600
committerSoft Linden <soft@lindenlab.com>2009-11-03 15:49:33 -0600
commit4e52e09fea81fbde6019afc39b1c028b393fb4c8 (patch)
tree163943f84ea0388c5e94d708fe5ae9a6c55f70eb /indra
parent2a0697711aefaa25c698bae8e57c0964ba38b3fb (diff)
DEV-37978 VWR-8617: Missing / incorrect keywords TEXTURE_MEDIA and TEXTURE_DEFAULT
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/keywords.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 544f1c598e..5f6fd6e4a7 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -560,7 +560,8 @@ STATUS_WHITELIST_FAILED URL failed to pass whitelist
NULL_KEY Indicates an empty key
EOF Indicates the last line of a notecard was read
TEXTURE_BLANK UUID for the "Blank" texture
-TEXTURE_DEFAULT UUID for the "Default Media" texture
+TEXTURE_DEFAULT Alias for TEXTURE_PLYWOOD
+TEXTURE_MEDIA UUID for the "Default Media" texture
TEXTURE_PLYWOOD UUID for the default "Plywood" texture
TEXTURE_TRANSPARENT UUID for the "White - Transparent" texture