diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-10-13 15:32:42 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-10-13 15:32:42 -0500 |
| commit | 71d0603773a0d406560fc6add8a61f7e8d3cdb27 (patch) | |
| tree | 12a2629604a0e576b7c36063709a659059070ba1 /indra/newview/app_settings | |
| parent | 20f1ca92973f4cc44465ba76c0e5add9e657e1f1 (diff) | |
| parent | b877e80d70875ff01ee0f522b775b766838d7404 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/keywords.ini | 1 | ||||
| -rw-r--r-- | indra/newview/app_settings/keywords_lsl_default.xml | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 9699eda96b..4e177ab518 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -274,6 +274,7 @@ INVENTORY_NOTECARD Passed to task inventory library functions to reference notec INVENTORY_BODYPART Passed to task inventory library functions to reference body parts INVENTORY_ANIMATION Passed to task inventory library functions to reference animations INVENTORY_GESTURE Passed to task inventory library functions to reference gestures +INVENTORY_MATERIAL Passed to task inventory library functions to reference materials INVENTORY_ALL Passed to task inventory library functions to reference all inventory items INVENTORY_NONE Returned by llGetInventoryType when no item is found diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml index d641883d5a..893b017367 100644 --- a/indra/newview/app_settings/keywords_lsl_default.xml +++ b/indra/newview/app_settings/keywords_lsl_default.xml @@ -1963,6 +1963,15 @@ <key>tooltip</key> <string/> </map> + <key>INVENTORY_MATERIAL</key> + <map> + <key>type</key> + <string>integer</string> + <key>value</key> + <integer>57</integer> + <key>tooltip</key> + <string/> + </map> <key>JSON_APPEND</key> <map> <key>type</key> |