Merge pull request #5440 from tapple/keywords-fixes-7

Keywords Fixes 7

2 files changed, 130 insertions, 58 deletions

diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml
index e95d9f2478..67c150704b 100644
--- a/indra/newview/app_settings/keywords_lsl_default.xml
+++ b/indra/newview/app_settings/keywords_lsl_default.xml
@@ -1427,7 +1427,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"45e0fcfa-2268-4490-a51c-3e51bdfe80d1"</string>
+            <string>45e0fcfa-2268-4490-a51c-3e51bdfe80d1</string>
          </map>
          <key>CONTENT_TYPE_ATOM</key>
          <map>
@@ -1992,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>"␊␊␊"</string>
+            <string>\\n\\n\\n</string>
          </map>
          <key>ERR_GENERIC</key>
          <map>
@@ -2534,7 +2534,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"9742065b-19b5-297c-858a-29711d539043"</string>
+            <string>9742065b-19b5-297c-858a-29711d539043</string>
          </map>
          <key>IMG_USE_BAKED_AUX2</key>
          <map>
@@ -2543,7 +2543,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"03642e83-2bd1-4eb9-34b4-4c47ed586d2d"</string>
+            <string>03642e83-2bd1-4eb9-34b4-4c47ed586d2d</string>
          </map>
          <key>IMG_USE_BAKED_AUX3</key>
          <map>
@@ -2552,7 +2552,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"edd51b77-fc10-ce7a-4b3d-011dfc349e4f"</string>
+            <string>edd51b77-fc10-ce7a-4b3d-011dfc349e4f</string>
          </map>
          <key>IMG_USE_BAKED_EYES</key>
          <map>
@@ -2561,7 +2561,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"52cc6bb6-2ee5-e632-d3ad-50197b1dcb8a"</string>
+            <string>52cc6bb6-2ee5-e632-d3ad-50197b1dcb8a</string>
          </map>
          <key>IMG_USE_BAKED_HAIR</key>
          <map>
@@ -2570,7 +2570,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"09aac1fb-6bce-0bee-7d44-caac6dbb6c63"</string>
+            <string>09aac1fb-6bce-0bee-7d44-caac6dbb6c63</string>
          </map>
          <key>IMG_USE_BAKED_HEAD</key>
          <map>
@@ -2579,7 +2579,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"5a9f4a74-30f2-821c-b88d-70499d3e7183"</string>
+            <string>5a9f4a74-30f2-821c-b88d-70499d3e7183</string>
          </map>
          <key>IMG_USE_BAKED_LEFTARM</key>
          <map>
@@ -2588,7 +2588,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"ff62763f-d60a-9855-890b-0c96f8f8cd98"</string>
+            <string>ff62763f-d60a-9855-890b-0c96f8f8cd98</string>
          </map>
          <key>IMG_USE_BAKED_LEFTLEG</key>
          <map>
@@ -2597,7 +2597,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"8e915e25-31d1-cc95-ae08-d58a47488251"</string>
+            <string>8e915e25-31d1-cc95-ae08-d58a47488251</string>
          </map>
          <key>IMG_USE_BAKED_LOWER</key>
          <map>
@@ -2606,7 +2606,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"24daea5f-0539-cfcf-047f-fbc40b2786ba"</string>
+            <string>24daea5f-0539-cfcf-047f-fbc40b2786ba</string>
          </map>
          <key>IMG_USE_BAKED_SKIRT</key>
          <map>
@@ -2615,7 +2615,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"43529ce8-7faa-ad92-165a-bc4078371687"</string>
+            <string>43529ce8-7faa-ad92-165a-bc4078371687</string>
          </map>
          <key>IMG_USE_BAKED_UPPER</key>
          <map>
@@ -2624,7 +2624,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"ae2de45c-d252-50b8-5c6e-19f39ce79317"</string>
+            <string>ae2de45c-d252-50b8-5c6e-19f39ce79317</string>
          </map>
          <key>INVENTORY_ALL</key>
          <map>
@@ -2768,7 +2768,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"\u{FDD2}"</string>
+            <string>\\ufdd2</string>
          </map>
          <key>JSON_DELETE</key>
          <map>
@@ -2777,7 +2777,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"\u{FDD8}"</string>
+            <string>\\ufdd8</string>
          </map>
          <key>JSON_FALSE</key>
          <map>
@@ -2786,7 +2786,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"\u{FDD7}"</string>
+            <string>\\ufdd7</string>
          </map>
          <key>JSON_INVALID</key>
          <map>
@@ -2795,7 +2795,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"\u{FDD0}"</string>
+            <string>\\ufdd0</string>
          </map>
          <key>JSON_NULL</key>
          <map>
@@ -2804,7 +2804,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"\u{FDD5}"</string>
+            <string>\\ufdd5</string>
          </map>
          <key>JSON_NUMBER</key>
          <map>
@@ -2813,7 +2813,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"\u{FDD3}"</string>
+            <string>\\ufdd3</string>
          </map>
          <key>JSON_OBJECT</key>
          <map>
@@ -2822,7 +2822,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"\u{FDD1}"</string>
+            <string>\\ufdd1</string>
          </map>
          <key>JSON_STRING</key>
          <map>
@@ -2831,7 +2831,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"\u{FDD4}"</string>
+            <string>\\ufdd4</string>
          </map>
          <key>JSON_TRUE</key>
          <map>
@@ -2840,7 +2840,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"\u{FDD6}"</string>
+            <string>\\ufdd6</string>
          </map>
          <key>KFM_CMD_PAUSE</key>
          <map>
@@ -3326,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>"␊␕␊"</string>
+            <string>\\n\\x15\\n</string>
          </map>
          <key>NULL_KEY</key>
          <map>
@@ -3335,7 +3335,7 @@ This file is auto-generated by https://github.com/secondlife/lsl-definitions. --
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"00000000-0000-0000-0000-000000000000"</string>
+            <string>00000000-0000-0000-0000-000000000000</string>
          </map>
          <key>OBJECT_ACCOUNT_LEVEL</key>
          <map>
@@ -8233,7 +8233,7 @@ vector position - position in local coordinates
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"5748decc-f629-461c-9a36-a35a221fe21f"</string>
+            <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
          </map>
          <key>TEXTURE_DEFAULT</key>
          <map>
@@ -8242,7 +8242,7 @@ vector position - position in local coordinates
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"89556747-24cb-43ed-920b-47caed15465f"</string>
+            <string>89556747-24cb-43ed-920b-47caed15465f</string>
          </map>
          <key>TEXTURE_MEDIA</key>
          <map>
@@ -8251,7 +8251,7 @@ vector position - position in local coordinates
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"8b5fec65-8d8d-9dc5-cda8-8fdf2716e361"</string>
+            <string>8b5fec65-8d8d-9dc5-cda8-8fdf2716e361</string>
          </map>
          <key>TEXTURE_PLYWOOD</key>
          <map>
@@ -8260,7 +8260,7 @@ vector position - position in local coordinates
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"89556747-24cb-43ed-920b-47caed15465f"</string>
+            <string>89556747-24cb-43ed-920b-47caed15465f</string>
          </map>
          <key>TEXTURE_TRANSPARENT</key>
          <map>
@@ -8269,7 +8269,7 @@ vector position - position in local coordinates
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"</string>
+            <string>8dcd4a48-2d37-4909-9f78-f7a9eb4ef903</string>
          </map>
          <key>TOUCH_INVALID_FACE</key>
          <map>
@@ -8566,7 +8566,7 @@ vector position - position in local coordinates
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"URL_REQUEST_DENIED"</string>
+            <string>URL_REQUEST_DENIED</string>
          </map>
          <key>URL_REQUEST_GRANTED</key>
          <map>
@@ -8575,7 +8575,7 @@ vector position - position in local coordinates
             <key>type</key>
             <string>string</string>
             <key>value</key>
-            <string>"URL_REQUEST_GRANTED"</string>
+            <string>URL_REQUEST_GRANTED</string>
          </map>
          <key>VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY</key>
          <map>
@@ -13567,7 +13567,7 @@ If another state is defined before the default state, the compiler will report a
                   <key>Parameters</key>
                   <map>
                      <key>tooltip</key>
-                     <string>A list of PRIM_* property constants to return values of.</string>
+                     <string>A list of PRIM_MEDIA_* property constants to return values of.</string>
                      <key>type</key>
                      <string>list</string>
                   </map>
@@ -14497,7 +14497,7 @@ If another state is defined before the default state, the compiler will report a
                   <key>Parameters</key>
                   <map>
                      <key>tooltip</key>
-                     <string>One or more PRIM_MEDIA_* flags</string>
+                     <string>A list of PRIM_MEDIA_* property constants to return values of.</string>
                      <key>type</key>
                      <string>list</string>
                   </map>
diff --git a/indra/newview/app_settings/keywords_lua_default.xml b/indra/newview/app_settings/keywords_lua_default.xml
index e69a6d9845..d6fb2f12fb 100644
--- a/indra/newview/app_settings/keywords_lua_default.xml
+++ b/indra/newview/app_settings/keywords_lua_default.xml
@@ -9830,7 +9830,7 @@ vector position - position in local coordinates
                      <key>tooltip</key>
                      <string>Six float values in range [-1, 1]</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number}</string>
                   </map>
                </map>
             </array>
@@ -15153,6 +15153,42 @@ Returns true if result is non-zero.</string>
             <key>tooltip</key>
             <string>Table manipulation library. Tables are collections of key-value pairs.</string>
          </map>
+         <key>table.append</key>
+         <map>
+            <key>type-arguments</key>
+            <array>
+               <string>V</string>
+            </array>
+            <key>arguments</key>
+            <array>
+               <map>
+                  <key>a</key>
+                  <map>
+                     <key>tooltip</key>
+                     <string>Array to be appended to.</string>
+                     <key>type</key>
+                     <string>{V}</string>
+                  </map>
+               </map>
+               <map>
+                  <key>...</key>
+                  <map>
+                     <key>tooltip</key>
+                     <string>Values to append.</string>
+                     <key>type</key>
+                     <string>...V</string>
+                  </map>
+               </map>
+            </array>
+            <key>energy</key>
+            <real>10.0</real>
+            <key>return</key>
+            <string>()</string>
+            <key>sleep</key>
+            <real>0.0</real>
+            <key>tooltip</key>
+            <string>Appends one or more an elements to end of the array.</string>
+         </map>
          <key>table.clear</key>
          <map>
             <key>arguments</key>
@@ -15290,6 +15326,42 @@ Returns true if result is non-zero.</string>
             <key>tooltip</key>
             <string>Creates a new table with pre-allocated array capacity, optionally filled.</string>
          </map>
+         <key>table.extend</key>
+         <map>
+            <key>type-arguments</key>
+            <array>
+               <string>V</string>
+            </array>
+            <key>arguments</key>
+            <array>
+               <map>
+                  <key>a</key>
+                  <map>
+                     <key>tooltip</key>
+                     <string>Array to be appended to.</string>
+                     <key>type</key>
+                     <string>{V}</string>
+                  </map>
+               </map>
+               <map>
+                  <key>b</key>
+                  <map>
+                     <key>tooltip</key>
+                     <string>Array to append.</string>
+                     <key>type</key>
+                     <string>{V}</string>
+                  </map>
+               </map>
+            </array>
+            <key>energy</key>
+            <real>10.0</real>
+            <key>return</key>
+            <string>{V}</string>
+            <key>sleep</key>
+            <real>0.0</real>
+            <key>tooltip</key>
+            <string>Appends all elements from one array to the end of another. Shorthand for table.move(b, 1, #b, #a+1, a)</string>
+         </map>
          <key>table.find</key>
          <map>
             <key>type-arguments</key>
@@ -18288,7 +18360,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string></string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{string}</string>
                   </map>
                </map>
                <map>
@@ -18911,7 +18983,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>
@@ -19236,7 +19308,7 @@ Returns true if result is non-zero.</string>
             <key>energy</key>
             <real>10.0</real>
             <key>return</key>
-            <string>list</string>
+            <string>{vector}</string>
             <key>sleep</key>
             <real>0.0</real>
             <key>tooltip</key>
@@ -19400,7 +19472,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string>List of environment settings requested for the specified parcel location.</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number}</string>
                   </map>
                </map>
             </array>
@@ -19876,9 +19948,9 @@ Returns true if result is non-zero.</string>
                   <key>Parameters</key>
                   <map>
                      <key>tooltip</key>
-                     <string>A list of PRIM_* property constants to return values of.</string>
+                     <string>A list of PRIM_MEDIA_* property constants to return values of.</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number}</string>
                   </map>
                </map>
             </array>
@@ -19970,7 +20042,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string>PRIM_* flags.</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number}</string>
                   </map>
                </map>
             </array>
@@ -20381,7 +20453,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string>List of OBJECT_* flags.</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number}</string>
                   </map>
                </map>
             </array>
@@ -20579,7 +20651,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string>List of details requested for the specified parcel location.</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number}</string>
                   </map>
                </map>
             </array>
@@ -20761,7 +20833,7 @@ Returns true if result is non-zero.</string>
             <key>energy</key>
             <real>10.0</real>
             <key>return</key>
-            <string>list</string>
+            <string>{number}</string>
             <key>sleep</key>
             <real>0.0</real>
             <key>tooltip</key>
@@ -20798,9 +20870,9 @@ Returns true if result is non-zero.</string>
                   <key>Parameters</key>
                   <map>
                      <key>tooltip</key>
-                     <string>One or more PRIM_MEDIA_* flags</string>
+                     <string>A list of PRIM_MEDIA_* property constants to return values of.</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number}</string>
                   </map>
                </map>
             </array>
@@ -20823,7 +20895,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string>PRIM_* flags and face parameters</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number}</string>
                   </map>
                </map>
             </array>
@@ -21587,14 +21659,14 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string>List of visual parameter IDs.</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number | string}</string>
                   </map>
                </map>
             </array>
             <key>energy</key>
             <real>10.0</real>
             <key>return</key>
-            <string>list</string>
+            <string>{number | ""}</string>
             <key>sleep</key>
             <real>0.0</real>
             <key>tooltip</key>
@@ -21642,7 +21714,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string>Inventory items to give to the agent.</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{string}</string>
                   </map>
                </map>
                <map>
@@ -21724,7 +21796,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string></string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{string}</string>
                   </map>
                </map>
             </array>
@@ -22801,7 +22873,7 @@ Returns true if result is non-zero.</string>
             <key>energy</key>
             <real>10.0</real>
             <key>return</key>
-            <string>list</string>
+            <string>{number}</string>
             <key>sleep</key>
             <real>0.0</real>
             <key>tooltip</key>
@@ -22874,7 +22946,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>
@@ -22906,7 +22978,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>
@@ -25112,7 +25184,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string></string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number}</string>
                   </map>
                </map>
             </array>
@@ -25286,7 +25358,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string>A list of vectors for the character to travel through sequentially. The list must contain at least two entries.</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{vector}</string>
                   </map>
                </map>
                <map>
@@ -26419,7 +26491,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string>List of object UUIDs to be returned.</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{uuid}</string>
                   </map>
                </map>
             </array>
@@ -28627,7 +28699,7 @@ Returns true if result is non-zero.</string>
                      <key>tooltip</key>
                      <string>Specifies the 4 payment values shown in the payment dialog's buttons (or PAY_HIDE).</string>
                      <key>type</key>
-                     <string>list</string>
+                     <string>{number}</string>
                   </map>
                </map>
             </array>