diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml
index 8e89834b83..9f48561b97 100644
--- a/bin/ScriptSyntax.xml
+++ b/bin/ScriptSyntax.xml
@@ -1,4 +1,4 @@
-21c53711-f48d-a201-a7f0-8cb35768e7e2
+065ac300-52fe-3cd0-f691-1896f6d48c67
 <llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
 <key>controls</key>
 <map>
@@ -3230,20 +3230,6 @@
 </map>
 <key>functions</key>
 <map>
- <key>cmDetectedCountry</key>
- <map>
-  <key>return</key><string>key</string>
-  <key>arguments</key><array>
-   <map><key>detectedNumber</key><map><key>type</key><string>integer</string></map></map>
-  </array>
- </map>
- <key>cmGetAgentCountry</key>
- <map>
-  <key>return</key><string>string</string>
-  <key>arguments</key><array>
-   <map><key>agentId</key><map><key>type</key><string>key</string></map></map>
-  </array>
- </map>
  <key>llAbs</key>
  <map>
   <key>return</key><string>integer</string>
@@ -6054,7 +6040,7 @@
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
    <map><key>rules</key><map><key>type</key><string>list</string></map></map>
-   <map><key>target</key><map><key>type</key><string>key</string></map></map>
+   <map><key>targetId</key><map><key>type</key><string>key</string></map></map>
   </array>
  </map>
  <key>osAdjustSoundVolume</key>
@@ -6131,6 +6117,13 @@
    <map><key>Command</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
+ <key>osDetectedCountry</key>
+ <map>
+  <key>return</key><string>string</string>
+  <key>arguments</key><array>
+   <map><key>number</key><map><key>type</key><string>integer</string></map></map>
+  </array>
+ </map>
  <key>osDie</key>
  <map>
   <key>arguments</key><array>
@@ -6188,6 +6181,8 @@
   <key>return</key><string>string</string>
   <key>arguments</key><array>
    <map><key>drawList</key><map><key>type</key><string>string</string></map></map>
+   <map><key>startX</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>startY</key><map><key>type</key><string>integer</string></map></map>
    <map><key>endX</key><map><key>type</key><string>integer</string></map></map>
    <map><key>endY</key><map><key>type</key><string>integer</string></map></map>
   </array>
@@ -6197,8 +6192,6 @@
   <key>return</key><string>string</string>
   <key>arguments</key><array>
    <map><key>drawList</key><map><key>type</key><string>string</string></map></map>
-   <map><key>startX</key><map><key>type</key><string>integer</string></map></map>
-   <map><key>startY</key><map><key>type</key><string>integer</string></map></map>
    <map><key>endX</key><map><key>type</key><string>integer</string></map></map>
    <map><key>endY</key><map><key>type</key><string>integer</string></map></map>
   </array>
@@ -6337,13 +6330,13 @@
  <map>
   <key>arguments</key><array>
    <map><key>avatar</key><map><key>type</key><string>string</string></map></map>
+   <map><key>target</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
  <key>osForceOtherSit</key>
  <map>
   <key>arguments</key><array>
    <map><key>avatar</key><map><key>type</key><string>string</string></map></map>
-   <map><key>target</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
  <key>osFormatString</key>
@@ -6354,6 +6347,13 @@
    <map><key>strings</key><map><key>type</key><string>list</string></map></map>
   </array>
  </map>
+ <key>osGetAgentCountry</key>
+ <map>
+  <key>return</key><string>string</string>
+  <key>arguments</key><array>
+   <map><key>agentId</key><map><key>type</key><string>key</string></map></map>
+  </array>
+ </map>
  <key>osGetAgentIP</key>
  <map>
   <key>return</key><string>string</string>
@@ -7164,6 +7164,8 @@
  <map>
   <key>arguments</key><array>
    <map><key>agent</key><map><key>type</key><string>string</string></map></map>
+   <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
    <map><key>position</key><map><key>type</key><string>vector</string></map></map>
    <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
   </array>
@@ -7172,8 +7174,6 @@
  <map>
   <key>arguments</key><array>
    <map><key>agent</key><map><key>type</key><string>string</string></map></map>
-   <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
-   <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
    <map><key>position</key><map><key>type</key><string>vector</string></map></map>
    <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
   </array>
@@ -7198,6 +7198,15 @@
   </array>
  </map>
  <key>osTeleportOwner</key>
+ <map>
+  <key>arguments</key><array>
+   <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>position</key><map><key>type</key><string>vector</string></map></map>
+   <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
+  </array>
+ </map>
+ <key>osTeleportOwner</key>
  <map>
   <key>arguments</key><array>
    <map><key>regionName</key><map><key>type</key><string>string</string></map></map>
@@ -7212,15 +7221,6 @@
    <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
   </array>
  </map>
- <key>osTeleportOwner</key>
- <map>
-  <key>arguments</key><array>
-   <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
-   <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
-   <map><key>position</key><map><key>type</key><string>vector</string></map></map>
-   <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
-  </array>
- </map>
  <key>osTerrainFlush</key>
  <map>
   <key>arguments</key><undef/>