diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-10-11 15:34:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-11 15:34:27 -0700 |
| commit | 5473c0e2da7b14e55890af8bfc145a1442c0beea (patch) | |
| tree | 3ecac9314b1b3d242905c3ee840ad9b7e8000f06 | |
| parent | 0d47ea31e38601683ef7351300950ec075cc35dd (diff) | |
| parent | 68cf572514415bcd7ff014ae728c376b8928c159 (diff) | |
Merge pull request #438 from secondlife/SL-20450
SL-20450: Fix missing LSL keyword INVENTORY_MATERIAL
| -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> |