summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Lihatskiy <118752495+marchcat@users.noreply.github.com>2026-02-11 12:05:06 +0200
committerGitHub <noreply@github.com>2026-02-11 12:05:06 +0200
commit79b3ac7283acce7b1457f31db0a5d09167c91d9d (patch)
treeed584239c793d22173820c71ae6fd201b9488f39
parentbec00bb3b9209e4e4244db2c9fc4a79377268231 (diff)
parent68c296a4bb2d0f4d475d992cc1a35b006aa84cb4 (diff)
Merge pull request #5399 from tapple/keywords-fixes-6
Keywords Fixes 6
Diffstat
-rw-r--r--indra/newview/app_settings/keywords_lsl_default.xml13
-rw-r--r--indra/newview/app_settings/keywords_lua_default.xml73
2 files changed, 52 insertions, 34 deletions
diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml
index b5cc42b0d3..e95d9f2478 100644
--- a/indra/newview/app_settings/keywords_lsl_default.xml
+++ b/indra/newview/app_settings/keywords_lsl_default.xml
@@ -1804,6 +1804,15 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
<key>value</key>
<string>4</string>
</map>
+ <key>DATA_RESERVED_0</key>
+ <map>
+ <key>tooltip</key>
+ <string>Reserved for Linden use.</string>
+ <key>type</key>
+ <string>integer</string>
+ <key>value</key>
+ <string>9</string>
+ </map>
<key>DATA_SIM_POS</key>
<map>
<key>tooltip</key>
@@ -1983,7 +1992,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
<key>type</key>
<string>string</string>
<key>value</key>
- <string>"\n\n\n"</string>
+ <string>"␊␊␊"</string>
</map>
<key>ERR_GENERIC</key>
<map>
@@ -3317,7 +3326,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
<key>type</key>
<string>string</string>
<key>value</key>
- <string>"\n\x15\n"</string>
+ <string>"␊␕␊"</string>
</map>
<key>NULL_KEY</key>
<map>
diff --git a/indra/newview/app_settings/keywords_lua_default.xml b/indra/newview/app_settings/keywords_lua_default.xml
index d65b849af3..e69a6d9845 100644
--- a/indra/newview/app_settings/keywords_lua_default.xml
+++ b/indra/newview/app_settings/keywords_lua_default.xml
@@ -2056,6 +2056,15 @@ export type rotation = quaternion</string>
<key>value</key>
<string>4</string>
</map>
+ <key>DATA_RESERVED_0</key>
+ <map>
+ <key>tooltip</key>
+ <string>Reserved for Linden use.</string>
+ <key>type</key>
+ <string>number</string>
+ <key>value</key>
+ <string>9</string>
+ </map>
<key>DATA_SIM_POS</key>
<map>
<key>tooltip</key>
@@ -2235,7 +2244,7 @@ export type rotation = quaternion</string>
<key>type</key>
<string>string</string>
<key>value</key>
- <string>"\n\n\n"</string>
+ <string>"␊␊␊"</string>
</map>
<key>ERR_GENERIC</key>
<map>
@@ -3560,7 +3569,7 @@ export type rotation = quaternion</string>
<key>type</key>
<string>string</string>
<key>value</key>
- <string>"\n\x15\n"</string>
+ <string>"␊␕␊"</string>
</map>
<key>NULL_KEY</key>
<map>
@@ -17382,7 +17391,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -17414,7 +17423,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
</array>
@@ -18596,7 +18605,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -18639,7 +18648,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -19010,7 +19019,7 @@ Returns true if result is non-zero.</string>
<key>energy</key>
<real>10.0</real>
<key>return</key>
- <string>list</string>
+ <string>{uuid}</string>
<key>sleep</key>
<real>0.0</real>
<key>tooltip</key>
@@ -20220,7 +20229,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -20252,7 +20261,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -20284,7 +20293,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
</array>
@@ -20333,7 +20342,7 @@ Returns true if result is non-zero.</string>
<key>energy</key>
<real>10.0</real>
<key>return</key>
- <string>list</string>
+ <string>{string}</string>
<key>sleep</key>
<real>0.0</real>
<key>tooltip</key>
@@ -22533,7 +22542,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -24095,7 +24104,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -24127,7 +24136,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -24159,7 +24168,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -24268,7 +24277,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -24347,7 +24356,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -24435,7 +24444,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -24523,7 +24532,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -25309,7 +25318,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -25341,7 +25350,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -25405,7 +25414,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
</array>
@@ -28235,7 +28244,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -28308,7 +28317,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -28851,7 +28860,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -29103,7 +29112,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -29649,7 +29658,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -29701,7 +29710,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
</array>
@@ -29795,7 +29804,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
</array>
@@ -29860,7 +29869,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
</array>
@@ -30516,7 +30525,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
@@ -30548,7 +30557,7 @@ Returns true if result is non-zero.</string>
<key>tooltip</key>
<string></string>
<key>type</key>
- <string>string</string>
+ <string>string | uuid</string>
</map>
</map>
<map>
generated by cgit v1.3 (git 2.53.0) at 2026-10-18 23:49:36 +0000