several changes to llIsFriend and related methods

OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

@@ -207,7 +207,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             if (!m_Enabled)
                 return;
 
-//            m_log.DebugFormat("[FRIENDS MODULE]: AddRegion on {0}", Name);
+            //m_log.DebugFormat("[FRIENDS MODULE]: AddRegion on {0}", Name);
 
             m_Scenes.Add(scene);
             scene.RegisterModuleInterface<IFriendsModule>(this);
@@ -254,6 +254,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             return 0;
         }
 
+        public bool IsFriend(UUID principalID, UUID friendID)
+        {
+            FriendInfo[] friends = GetFriendsFromCache(principalID);
+            if (friends.Length > 0)
+            {
+                FriendInfo finfo = GetFriend(friends, friendID);
+                return (finfo is not null && finfo.TheirFlags != -1);
+            }
+            return false;
+        }
+
         public bool IsFriendOnline(UUID userID, UUID friendID)
         {
             if(m_OnlineFriendsCache.TryGetValue(userID, out HashSet<UUID> friends))

OpenSim/Region/Framework/Interfaces/IFriendsModule.cs

@@ -100,5 +100,6 @@ namespace OpenSim.Region.Framework.Interfaces
         void CacheFriendsOnline(UUID userID, List<UUID> friendsOnline, bool online);
         void CacheFriendOnline(UUID userID, UUID friendOnline, bool online);
         List<UUID> GetCachedFriendsOnline(UUID userID);
+        bool IsFriend(UUID userID, UUID friendID);
     }
 }

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
 using System.Timers;
@@ -46,7 +47,6 @@ using Timer = System.Timers.Timer;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using PermissionMask = OpenSim.Framework.PermissionMask;
-using System.Runtime.CompilerServices;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -463,7 +463,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// If true then updates are running.  This may be true for a short period after a scene is de-activated.
         /// </summary>
-        public bool IsRunning { get { return m_isRunning; } }
+        public bool IsRunning
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get { return m_isRunning; }
+        }
         private volatile bool m_isRunning;
 
         private bool m_firstHeartbeat = true;
@@ -1193,6 +1197,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// TODO: Possibly stop other classes being able to manipulate this directly.
         public SceneGraph SceneGraph
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get { return m_sceneGraph; }
         }
 
@@ -5196,17 +5201,31 @@ Label_GroupsDone:
         /// </summary>
         /// <param name="agentID"></param>
         /// <returns>null if the presence was not found</returns>
+        
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ScenePresence GetScenePresence(UUID agentID)
         {
             return m_sceneGraph.GetScenePresence(agentID);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public override bool TryGetScenePresence(UUID agentID, out ScenePresence presence)
+        {
+            return m_sceneGraph.TryGetScenePresence(agentID, out presence);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryGetSceneRootPresence(UUID agentID, out ScenePresence presence)
+        {
+            return m_sceneGraph.TryGetSceneRootPresence(agentID, out presence);
+        }
         /// <summary>
         /// Request the scene presence by name.
         /// </summary>
         /// <param name="firstName"></param>
         /// <param name="lastName"></param>
         /// <returns>null if the presence was not found</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ScenePresence GetScenePresence(string firstName, string lastName)
         {
             return m_sceneGraph.GetScenePresence(firstName, lastName);
@@ -5217,6 +5236,7 @@ Label_GroupsDone:
         /// </summary>
         /// <param name="localID"></param>
         /// <returns>null if the presence was not found</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ScenePresence GetScenePresence(uint localID)
         {
             return m_sceneGraph.GetScenePresence(localID);
@@ -5235,6 +5255,7 @@ Label_GroupsDone:
         /// The shared list of the scene presences.
         /// </returns>
         /// WARNING DO NOT MODIFY RETURNED VALUE
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public List<ScenePresence> GetScenePresences()
         {
             //return new List<ScenePresence>(m_sceneGraph.GetScenePresences());
@@ -5246,6 +5267,7 @@ Label_GroupsDone:
         /// Avatars may be an NPC or a 'real' client.
         /// </summary>
         /// <param name="action"></param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void ForEachRootScenePresence(Action<ScenePresence> action)
         {
             m_sceneGraph.ForEachRootScenePresence(action);
@@ -5255,6 +5277,7 @@ Label_GroupsDone:
         /// Performs action on all scene presences (root and child)
         /// </summary>
         /// <param name="action"></param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void ForEachScenePresence(Action<ScenePresence> action)
         {
             m_sceneGraph.ForEachScenePresence(action);
@@ -5266,6 +5289,7 @@ Label_GroupsDone:
         /// <returns>
         /// The scene object groups.  If the scene is empty then an empty list is returned.
         /// </returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public List<SceneObjectGroup> GetSceneObjectGroups()
         {
             return m_sceneGraph.GetSceneObjectGroups();
@@ -5276,6 +5300,7 @@ Label_GroupsDone:
         /// </summary>
         /// <param name="fullID"></param>
         /// <returns>null if no group with that id exists</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public SceneObjectGroup GetSceneObjectGroup(UUID fullID)
         {
             return m_sceneGraph.GetSceneObjectGroup(fullID);
@@ -5287,6 +5312,7 @@ Label_GroupsDone:
         /// <remarks>This will only return a group if the local ID matches a root part</remarks>
         /// <param name="localID"></param>
         /// <returns>null if no group with that id exists</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public SceneObjectGroup GetSceneObjectGroup(uint localID)
         {
             return m_sceneGraph.GetSceneObjectGroup(localID);
@@ -5298,6 +5324,7 @@ Label_GroupsDone:
         /// </summary>
         /// <param name="name"></param>
         /// <returns>null if no group with that name exists</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public SceneObjectGroup GetSceneObjectGroup(string name)
         {
             return m_sceneGraph.GetSceneObjectGroup(name);
@@ -5309,6 +5336,7 @@ Label_GroupsDone:
         /// <param name="fullID"></param>
         /// <param name="sog"></param>
         /// <returns></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool TryGetSceneObjectGroup(UUID fullID, out SceneObjectGroup sog)
         {
             sog = GetSceneObjectGroup(fullID);
@@ -5321,6 +5349,7 @@ Label_GroupsDone:
         /// </summary>
         /// <param name="name"></param>
         /// <returns></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public SceneObjectPart GetSceneObjectPart(string name)
         {
             return m_sceneGraph.GetSceneObjectPart(name);
@@ -5331,6 +5360,7 @@ Label_GroupsDone:
         /// </summary>
         /// <param name="localID"></param>
         /// <returns></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public SceneObjectPart GetSceneObjectPart(uint localID)
         {
             return m_sceneGraph.GetSceneObjectPart(localID);
@@ -5341,6 +5371,7 @@ Label_GroupsDone:
         /// </summary>
         /// <param name="fullID"></param>
         /// <returns></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public SceneObjectPart GetSceneObjectPart(UUID fullID)
         {
             return m_sceneGraph.GetSceneObjectPart(fullID);
@@ -5352,6 +5383,7 @@ Label_GroupsDone:
         /// <param name="fullID"></param>
         /// <param name="sop"></param>
         /// <returns></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool TryGetSceneObjectPart(UUID fullID, out SceneObjectPart sop)
         {
             return m_sceneGraph.TryGetSceneObjectPart(fullID, out sop);
@@ -5362,6 +5394,7 @@ Label_GroupsDone:
         /// </summary>
         /// <param name="localID"></param>
         /// <returns>null if no scene object group containing that prim is found</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public SceneObjectGroup GetGroupByPrim(uint localID)
         {
             return m_sceneGraph.GetGroupByPrim(localID);
@@ -5372,16 +5405,13 @@ Label_GroupsDone:
         /// </summary>
         /// <param name="fullID"></param>
         /// <returns>null if no scene object group containing that prim is found</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public SceneObjectGroup GetGroupByPrim(UUID fullID)
         {
             return m_sceneGraph.GetGroupByPrim(fullID);
         }
 
-        public override bool TryGetScenePresence(UUID agentID, out ScenePresence sp)
-        {
-            return m_sceneGraph.TryGetScenePresence(agentID, out sp);
-        }
-
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
         {
             return m_sceneGraph.TryGetAvatarByName(avatarName, out avatar);
@@ -5391,6 +5421,7 @@ Label_GroupsDone:
         /// Perform an action on all clients with an avatar in this scene (root only)
         /// </summary>
         /// <param name="action"></param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void ForEachRootClient(Action<IClientAPI> action)
         {
             ForEachRootScenePresence(delegate(ScenePresence presence)
@@ -5403,26 +5434,31 @@ Label_GroupsDone:
         /// Perform an action on all clients connected to the region (root and child)
         /// </summary>
         /// <param name="action"></param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void ForEachClient(Action<IClientAPI> action)
         {
             m_clientManager.ForEach(action);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public int GetNumberOfClients()
         {
             return m_clientManager.Count;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool TryGetClient(UUID avatarID, out IClientAPI client)
         {
             return m_clientManager.TryGetValue(avatarID, out client);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool TryGetClient(System.Net.IPEndPoint remoteEndPoint, out IClientAPI client)
         {
             return m_clientManager.TryGetValue(remoteEndPoint, out client);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void ForEachSOG(Action<SceneObjectGroup> action)
         {
             m_sceneGraph.ForEachSOG(action);
@@ -5433,6 +5469,7 @@ Label_GroupsDone:
         /// will not affect the original list of objects in the scene.
         /// </summary>
         /// <returns></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public EntityBase[] GetEntities()
         {
             return m_sceneGraph.GetEntities();
@@ -5441,15 +5478,15 @@ Label_GroupsDone:
         #endregion
 
 
-// Commented pending deletion since this method no longer appears to do anything at all
-//        public bool NeedSceneCacheClear(UUID agentID)
-//        {
-//            IInventoryTransferModule inv = RequestModuleInterface<IInventoryTransferModule>();
-//            if (inv is null)
-//                return true;
-//
-//            return inv.NeedSceneCacheClear(agentID, this);
-//        }
+        // Commented pending deletion since this method no longer appears to do anything at all
+        //        public bool NeedSceneCacheClear(UUID agentID)
+        //        {
+        //            IInventoryTransferModule inv = RequestModuleInterface<IInventoryTransferModule>();
+        //            if (inv is null)
+        //                return true;
+        //
+        //            return inv.NeedSceneCacheClear(agentID, this);
+        //        }
 
         public void CleanTempObjects()
         {
@@ -5473,6 +5510,7 @@ Label_GroupsDone:
             }
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void DeleteFromStorage(UUID uuid)
         {
             SimulationDataService.RemoveObject(uuid, RegionInfo.RegionID);
@@ -5566,12 +5604,14 @@ Environment.Exit(1);
 
         // Get terrain height at the specified <x,y> location.
         // Presumes the underlying implementation is a heightmap which is a 1m grid.
-     
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public float GetGroundHeight(float x, float y)
         {
            return Heightmap.GetHeight(x, y);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private void CheckHeartbeat()
         {
             if (m_firstHeartbeat)
@@ -5581,6 +5621,7 @@ Environment.Exit(1);
                 Start();
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override ISceneObject DeserializeObject(string representation)
         {
             return SceneObjectSerializer.FromXml2Format(representation);
@@ -5588,9 +5629,11 @@ Environment.Exit(1);
 
         public override bool AllowScriptCrossings
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get { return m_allowScriptCrossings; }
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Vector3 GetNearestAllowedPosition(ScenePresence avatar)
         {
             return GetNearestAllowedPosition(avatar, null);
@@ -5638,12 +5681,14 @@ Environment.Exit(1);
             return nearestRegionEdgePoint;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private Vector3 GetParcelCenterAtGround(ILandObject parcel)
         {
             Vector2 center = parcel.CenterPoint;
             return GetPositionAtGround(center.X, center.Y);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y)
         {
             return GetNearestAllowedParcel(avatarId, x, y, null);
@@ -5683,6 +5728,7 @@ Environment.Exit(1);
             return nearestParcel;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static Vector2 GetParcelSafeCorner(ILandObject parcel)
         {
             Vector2 place = parcel.StartPoint;
@@ -5736,6 +5782,7 @@ Environment.Exit(1);
             return ground;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private Vector3 GetPositionAtGround(float x, float y)
         {
             return new Vector3(x, y, GetGroundHeight(x, y));

OpenSim/Region/Framework/Scenes/SceneBase.cs

@@ -496,11 +496,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>null if there is no registered module implementing that interface</returns>
         public T RequestModuleInterface<T>()
         {
-            if (ModuleInterfaces.ContainsKey(typeof(T)) &&
-                    (ModuleInterfaces[typeof(T)].Count > 0))
-                return (T)ModuleInterfaces[typeof(T)][0];
-            else
-                return default(T);
+            if (ModuleInterfaces.TryGetValue(typeof(T), out List<object> mio ) && mio.Count > 0)
+                return (T)mio[0];
+
+            return default;
         }
 
         /// <summary>

OpenSim/Region/Framework/Scenes/SceneGraph.cs

@@ -1042,6 +1042,32 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        protected internal bool TryGetSceneRootPresence(UUID agentID, out ScenePresence avatar)
+        {
+            bool entered = false;
+            try
+            {
+                try { }
+                finally
+                {
+                    m_scenePresencesLock.EnterReadLock();
+                    entered = true;
+                }
+                return m_scenePresenceMap.TryGetValue(agentID, out avatar) && !avatar.IsChildAgent;
+            }
+            catch
+            {
+                avatar = null;
+                return false;
+            }
+            finally
+            {
+                if (entered)
+                    m_scenePresencesLock.ExitReadLock();
+            }
+        }
+
+
         protected internal bool TryGetAvatarByName(string name, out ScenePresence avatar)
         {
             List<ScenePresence> presences = GetScenePresences();

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -18513,7 +18513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (string.IsNullOrEmpty(pattern.m_string))
                     return src;
 
-                Regex rx = new(pattern, RegexOptions, new TimeSpan(500000)); // 50ms)
+                Regex rx = new(pattern, RegexOptions, TimeSpan.FromMilliseconds(10));
                 if (replacement == null)
                     return rx.Replace(src.m_string, string.Empty, count);
 
@@ -18713,6 +18713,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return new LSL_List(m_host.ParentGroup.LinksetData.ListKeysByPatttern(pattern.m_string, start, count));
         }
+
+        public LSL_Integer llIsFriend(LSL_Key agent_id)
+        {
+            SceneObjectGroup parentsog = m_host.ParentGroup;
+            if (parentsog is null || parentsog.IsDeleted)
+                return 0;
+
+            if (parentsog.OwnerID.Equals(parentsog.GroupID))
+                return llSameGroup(agent_id);
+
+            if (!UUID.TryParse(agent_id, out UUID agent) || agent.IsZero())
+                return 0;
+
+            IFriendsModule fm = World.RequestModuleInterface<IFriendsModule>();
+            if(fm is null)
+                return 0;
+
+            if (World.TryGetSceneRootPresence(agent, out _))
+                return fm.IsFriend(agent, parentsog.OwnerID) ? 1 : 0;
+
+            if (World.TryGetSceneRootPresence(parentsog.OwnerID, out _))
+                return fm.IsFriend(parentsog.OwnerID, agent) ? 1 : 0;
+
+            return 0;
+        }
     }
 
     public class NotecardCache

OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs

@@ -513,5 +513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
                void llLinksetDataReset();
         LSL_Integer llLinksetDataWrite(LSL_String name, LSL_String value);
         LSL_Integer llLinksetDataWriteProtected(LSL_String name, LSL_String value, LSL_String pass);
+
+        LSL_Integer llIsFriend(LSL_Key agent_id);
     }
 }

OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs

@@ -2778,11 +2778,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_LSL_Functions.llLinksetDataListKeys(start, count);
         }
-        
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public LSL_List llLinksetDataFindKeys(LSL_String pattern, LSL_Integer start, LSL_Integer count)
         {
             return m_LSL_Functions.llLinksetDataFindKeys(pattern, start, count);
         }
+        
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public LSL_Integer llIsFriend(LSL_Key agent_id)
+        {
+            return m_LSL_Functions.llIsFriend(agent_id);
+        }
     }
 }

OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs

@@ -2821,7 +2821,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public LSLFloat(int i)
             {
-                value = (double)i;
+                value = i;
             }
 
             public LSLFloat(double d)
@@ -2834,7 +2834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public LSLFloat(ReadOnlySpan<char> s)
             {
-                if(!double.TryParse(s, System.Globalization.NumberStyles.Float, Culture.NumberFormatInfo, out value))
+                if (!double.TryParse(s, NumberStyles.Float, Culture.NumberFormatInfo, out value))
                     value = 0;
             }
 

bin/ScriptSyntax.xml

@@ -1,4 +1,4 @@
-14b37185-d3a8-cd00-2a99-1e161b07e054
+fc2639fd-5d16-66bf-d8ab-2e4d754c816d
 <llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
 <key>controls</key>
 <map>
@@ -4936,6 +4936,13 @@
    <map><key>number</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
+ <key>llIsFriend</key>
+ <map>
+  <key>return</key><string>integer</string>
+  <key>arguments</key><array>
+   <map><key>agent_id</key><map><key>type</key><string>key</string></map></map>
+  </array>
+ </map>
  <key>llJson2List</key>
  <map>
   <key>return</key><string>list</string>
@@ -6805,8 +6812,9 @@
  <map>
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
-   <map><key>a</key><map><key>type</key><string>float</string></map></map>
-   <map><key>b</key><map><key>type</key><string>float</string></map></map>
+   <map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
+   <map><key>rb</key><map><key>type</key><string>rotation</string></map></map>
+   <map><key>margin</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
  <key>osApproxEquals</key>
@@ -6822,8 +6830,16 @@
  <map>
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
-   <map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
-   <map><key>rb</key><map><key>type</key><string>rotation</string></map></map>
+   <map><key>va</key><map><key>type</key><string>vector</string></map></map>
+   <map><key>vb</key><map><key>type</key><string>vector</string></map></map>
+  </array>
+ </map>
+ <key>osApproxEquals</key>
+ <map>
+  <key>return</key><string>integer</string>
+  <key>arguments</key><array>
+   <map><key>a</key><map><key>type</key><string>float</string></map></map>
+   <map><key>b</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
  <key>osApproxEquals</key>
@@ -6841,15 +6857,6 @@
   <key>arguments</key><array>
    <map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
    <map><key>rb</key><map><key>type</key><string>rotation</string></map></map>
-   <map><key>margin</key><map><key>type</key><string>float</string></map></map>
-  </array>
- </map>
- <key>osApproxEquals</key>
- <map>
-  <key>return</key><string>integer</string>
-  <key>arguments</key><array>
-   <map><key>va</key><map><key>type</key><string>vector</string></map></map>
-   <map><key>vb</key><map><key>type</key><string>vector</string></map></map>
   </array>
  </map>
  <key>osAvatarName2Key</key>
@@ -6995,8 +7002,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>
@@ -7006,6 +7011,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>
@@ -7144,13 +7151,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>
@@ -7429,14 +7436,14 @@
  <key>osGetPrimCount</key>
  <map>
   <key>return</key><string>integer</string>
-  <key>arguments</key><array>
-   <map><key>object_id</key><map><key>type</key><string>key</string></map></map>
-  </array>
+  <key>arguments</key><undef/>
  </map>
  <key>osGetPrimCount</key>
  <map>
   <key>return</key><string>integer</string>
-  <key>arguments</key><undef/>
+  <key>arguments</key><array>
+   <map><key>object_id</key><map><key>type</key><string>key</string></map></map>
+  </array>
  </map>
  <key>osGetPrimitiveParams</key>
  <map>
@@ -7501,14 +7508,14 @@
  <key>osGetSittingAvatarsCount</key>
  <map>
   <key>return</key><string>integer</string>
-  <key>arguments</key><undef/>
+  <key>arguments</key><array>
+   <map><key>object_id</key><map><key>type</key><string>key</string></map></map>
+  </array>
  </map>
  <key>osGetSittingAvatarsCount</key>
  <map>
   <key>return</key><string>integer</string>
-  <key>arguments</key><array>
-   <map><key>object_id</key><map><key>type</key><string>key</string></map></map>
-  </array>
+  <key>arguments</key><undef/>
  </map>
  <key>osGetStandTarget</key>
  <map>
@@ -7940,7 +7947,6 @@
   <key>return</key><string>key</string>
   <key>arguments</key><array>
    <map><key>notecard</key><map><key>type</key><string>string</string></map></map>
-   <map><key>includeHuds</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
  <key>osOwnerSaveAppearance</key>
@@ -7948,6 +7954,7 @@
   <key>return</key><string>key</string>
   <key>arguments</key><array>
    <map><key>notecard</key><map><key>type</key><string>string</string></map></map>
+   <map><key>includeHuds</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
  <key>osParcelJoin</key>
@@ -8011,13 +8018,13 @@
  <key>osRegionNotice</key>
  <map>
   <key>arguments</key><array>
-   <map><key>agentID</key><map><key>type</key><string>key</string></map></map>
    <map><key>msg</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
  <key>osRegionNotice</key>
  <map>
   <key>arguments</key><array>
+   <map><key>agentID</key><map><key>type</key><string>key</string></map></map>
    <map><key>msg</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
@@ -8026,7 +8033,6 @@
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
    <map><key>seconds</key><map><key>type</key><string>float</string></map></map>
-   <map><key>msg</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
  <key>osRegionRestart</key>
@@ -8034,6 +8040,7 @@
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
    <map><key>seconds</key><map><key>type</key><string>float</string></map></map>
+   <map><key>msg</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
  <key>osReplaceAgentEnvironment</key>
@@ -8274,7 +8281,6 @@
   <key>arguments</key><array>
    <map><key>drawList</key><map><key>type</key><string>string</string></map></map>
    <map><key>color</key><map><key>type</key><string>vector</string></map></map>
-   <map><key>alpha</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
  <key>osSetPenColor</key>
@@ -8291,6 +8297,7 @@
   <key>arguments</key><array>
    <map><key>drawList</key><map><key>type</key><string>string</string></map></map>
    <map><key>color</key><map><key>type</key><string>vector</string></map></map>
+   <map><key>alpha</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
  <key>osSetPenColour</key>
@@ -8479,21 +8486,10 @@
   <key>arguments</key><array>
    <map><key>src</key><map><key>type</key><string>string</string></map></map>
    <map><key>value</key><map><key>type</key><string>string</string></map></map>
-   <map><key>start</key><map><key>type</key><string>integer</string></map></map>
-   <map><key>count</key><map><key>type</key><string>integer</string></map></map>
    <map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
  <key>osStringIndexOf</key>
- <map>
-  <key>return</key><string>integer</string>
-  <key>arguments</key><array>
-   <map><key>src</key><map><key>type</key><string>string</string></map></map>
-   <map><key>value</key><map><key>type</key><string>string</string></map></map>
-   <map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
-  </array>
- </map>
- <key>osStringLastIndexOf</key>
  <map>
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
@@ -8513,6 +8509,17 @@
    <map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
+ <key>osStringLastIndexOf</key>
+ <map>
+  <key>return</key><string>integer</string>
+  <key>arguments</key><array>
+   <map><key>src</key><map><key>type</key><string>string</string></map></map>
+   <map><key>value</key><map><key>type</key><string>string</string></map></map>
+   <map><key>start</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>count</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
+  </array>
+ </map>
  <key>osStringRemove</key>
  <map>
   <key>return</key><string>string</string>
@@ -8575,6 +8582,7 @@
  <map>
   <key>arguments</key><array>
    <map><key>agent</key><map><key>type</key><string>string</string></map></map>
+   <map><key>regionName</key><map><key>type</key><string>string</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>
@@ -8593,7 +8601,6 @@
  <map>
   <key>arguments</key><array>
    <map><key>agent</key><map><key>type</key><string>string</string></map></map>
-   <map><key>regionName</key><map><key>type</key><string>string</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>
@@ -8609,14 +8616,6 @@
   </array>
  </map>
  <key>osTeleportOwner</key>
- <map>
-  <key>arguments</key><array>
-   <map><key>regionName</key><map><key>type</key><string>string</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>position</key><map><key>type</key><string>vector</string></map></map>
@@ -8632,6 +8631,14 @@
    <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>
+   <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/>