From 875606a04d656ef6e5600a3a7fb6e8b52feb1945 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 11 May 2008 20:56:42 +0000 Subject: QAR-566 maint-viewer-5-merge-2 Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2 Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release --- indra/newview/app_settings/keywords.ini | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 9a8b1f7537..b6892dc262 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -507,6 +507,10 @@ CLICK_ACTION_OPEN_MEDIA Used with llSetClickAction to set open-media as the defa [word .1, .3, .5] 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_PLYWOOD UUID for the default "Plywood" texture +TEXTURE_TRANSPARENT UUID for the "White - Transparent" texture # float constants [word .3, .1, .5] -- cgit v1.2.3