Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

2 files changed, 46 insertions, 19 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 880ca1b..fe71ed5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -54,13 +54,13 @@ using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
 namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
     [Serializable]
-    public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi
+    public class LS_Api : MarshalByRefObject, ILS_Api, IScriptApi
     {
         internal IScriptEngine m_ScriptEngine;
         internal SceneObjectPart m_host;
         internal uint m_localID;
         internal UUID m_itemID;
-        internal bool m_CMFunctionsEnabled = false;
+        internal bool m_LSFunctionsEnabled = false;
         internal IScriptModuleComms m_comms = null;
 
         public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
@@ -70,12 +70,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_localID = localID;
             m_itemID = itemID;
 
-            if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
-                m_CMFunctionsEnabled = true;
+            if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
+                m_LSFunctionsEnabled = true;
 
             m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
             if (m_comms == null)
-                m_CMFunctionsEnabled = false;
+                m_LSFunctionsEnabled = false;
         }
 
         public override Object InitializeLifetimeService()
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         //Dumps an error message on the debug console.
         //
 
-        internal void CMShoutError(string message)
+        internal void LSShoutError(string message)
         {
             if (message.Length > 1023)
                 message = message.Substring(0, 1023);
@@ -116,11 +116,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Get the current Windlight scene
         /// </summary>
         /// <returns>List of windlight parameters</returns>
-        public LSL_List cmGetWindlightScene(LSL_List rules)
+        public LSL_List lsGetWindlightScene(LSL_List rules)
         {
-            if (!m_CMFunctionsEnabled)
+            if (!m_LSFunctionsEnabled)
             {
-                CMShoutError("Careminster functions are not enabled.");
+                LSShoutError("LightShare functions are not enabled.");
                 return new LSL_List();
             }
             m_host.AddScriptLPS(1);
@@ -440,16 +440,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </summary>
         /// <param name="rules"></param>
         /// <returns>success: true or false</returns>
-        public int cmSetWindlightScene(LSL_List rules)
+        public int lsSetWindlightScene(LSL_List rules)
         {
-            if (!m_CMFunctionsEnabled)
+            if (!m_LSFunctionsEnabled)
             {
-                CMShoutError("Careminster functions are not enabled.");
+                LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
             if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
-                CMShoutError("cmSetWindlightScene can only be used by estate managers or owners.");
+                LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return 0;
             }
             int success = 0;
@@ -462,7 +462,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                CMShoutError("Windlight module is disabled");
+                LSShoutError("Windlight module is disabled");
                 return 0;
             }
             return success;
@@ -472,16 +472,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </summary>
         /// <param name="rules"></param>
         /// <returns>success: true or false</returns>
-        public int cmSetWindlightSceneTargeted(LSL_List rules, LSL_Key target)
+        public int lsSetWindlightSceneTargeted(LSL_List rules, LSL_Key target)
         {
-            if (!m_CMFunctionsEnabled)
+            if (!m_LSFunctionsEnabled)
             {
-                CMShoutError("Careminster functions are not enabled.");
+                LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
             if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
-                CMShoutError("cmSetWindlightSceneTargeted can only be used by estate managers or owners.");
+                LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
                 return 0;
             }
             int success = 0;
@@ -494,7 +494,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                CMShoutError("Windlight module is disabled");
+                LSShoutError("Windlight module is disabled");
                 return 0;
             }
             return success;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index dde664e..cd6d3a3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2202,5 +2202,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             
             m_LSL_Api.SetPrimitiveParamsEx(prim, rules);
         }
+
+        /// <summary>
+        /// Like osGetAgents but returns enough info for a radar
+        /// </summary>
+        /// <returns>Strided list of the UUID, position and name of each avatar in the region</returns>
+        public LSL_List osGetAvatarList()
+        {
+            CheckThreatLevel(ThreatLevel.None, "osGetAvatarList");
+
+            LSL_List result = new LSL_List();
+            World.ForEachScenePresence(delegate (ScenePresence avatar)
+            {
+                if (avatar != null && avatar.UUID != m_host.OwnerID)
+                {
+                    if (avatar.IsChildAgent == false)
+                    {
+                        if (avatar.PhysicsActor != null && avatar.PhysicsActor.Position != null)
+                        {
+                            result.Add(avatar.UUID);
+                            result.Add(avatar.PhysicsActor.Position);
+                            result.Add(avatar.Name);
+                        }
+                    }
+                }
+            });
+            return result;
+        }
     }
 }