diff options
| author | Soft Linden <soft@lindenlab.com> | 2009-11-03 15:49:33 -0600 |
|---|---|---|
| committer | Soft Linden <soft@lindenlab.com> | 2009-11-03 15:49:33 -0600 |
| commit | 4e52e09fea81fbde6019afc39b1c028b393fb4c8 (patch) | |
| tree | 163943f84ea0388c5e94d708fe5ae9a6c55f70eb | |
| parent | 2a0697711aefaa25c698bae8e57c0964ba38b3fb (diff) | |
DEV-37978 VWR-8617: Missing / incorrect keywords TEXTURE_MEDIA and TEXTURE_DEFAULT
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/app_settings/keywords.ini | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index f4ba643198..4e3379d21f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -297,6 +297,7 @@ Jacek Antonelli VWR-2947 VWR-2948 VWR-3605 + VWR-8617 JB Kraft VWR-5283 VWR-7802 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 |