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

Keywords Fixes 7

1 files changed, 97 insertions, 25 deletions

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>