diff --git a/doc/contributions.txt b/doc/contributions.txt index f4ba643198a117679ce9117115ea1762f4552689..4e3379d21fb09e5dd25c5ee5d8e5656fd376afa4 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 544f1c598e9a57e06c9cde70251bd6eadc1f53ac..5f6fd6e4a735564967a27766decc543bd1f58a50 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