7 files changed, 249 insertions, 240 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
index 9f829da..07cba60 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -1,4 +1,31 @@
-using System;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
 using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
@@ -7,7 +34,7 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim;
 using OpenSim.Framework;
-using OpenSim.Region.CoreModules.World.Meta7Windlight;
+using OpenSim.Region.CoreModules.World.LightShare;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.ScriptEngine.Shared;
@@ -92,7 +119,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_List cmGetAvatarList()
         {
             LSL_List result = new LSL_List();
-            foreach (ScenePresence avatar in World.GetAvatars())
+            World.ForEachScenePresence(delegate (ScenePresence avatar)
             {
                 if (avatar.UUID != m_host.OwnerID)
                 {
@@ -103,7 +130,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         result.Add(avatar.Name);
                     }
                 }
-            }
+            });
             return result;
         }
 
@@ -119,7 +146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return new LSL_List();
             }
             m_host.AddScriptLPS(1);
-            RegionMeta7WindlightData wl = m_host.ParentGroup.Scene.RegionInfo.WindlightSettings;
+            RegionLightShareData wl = m_host.ParentGroup.Scene.RegionInfo.WindlightSettings;
 
             LSL_List values = new LSL_List();
             int idx = 0;
@@ -253,9 +280,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         }
 
-        private RegionMeta7WindlightData getWindlightProfileFromRules(LSL_List rules)
+        private RegionLightShareData getWindlightProfileFromRules(LSL_List rules)
         {
-            RegionMeta7WindlightData wl = (RegionMeta7WindlightData)m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.Clone();
+            RegionLightShareData wl = (RegionLightShareData)m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.Clone();
 
             LSL_List values = new LSL_List();
             int idx = 0;
@@ -449,9 +476,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             int success = 0;
             m_host.AddScriptLPS(1);
-            if (Meta7WindlightModule.EnableWindlight)
+            if (LightShareModule.EnableWindlight)
             {
-                RegionMeta7WindlightData wl = getWindlightProfileFromRules(rules);
+                RegionLightShareData wl = getWindlightProfileFromRules(rules);
                 m_host.ParentGroup.Scene.StoreWindlightProfile(wl);
                 success = 1;
             }
@@ -481,9 +508,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             int success = 0;
             m_host.AddScriptLPS(1);
-            if (Meta7WindlightModule.EnableWindlight)
+            if (LightShareModule.EnableWindlight)
             { 
-                RegionMeta7WindlightData wl = getWindlightProfileFromRules(rules);
+                RegionLightShareData wl = getWindlightProfileFromRules(rules);
                 World.EventManager.TriggerOnSendNewWindlightProfileTargeted(wl, new UUID(target.m_string));
                 success = 1;
             }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 75dd615..6ab3c62 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -39,7 +39,7 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Region.CoreModules;
 using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Region.CoreModules.World.Terrain;
@@ -53,9 +53,9 @@ using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
 using OpenSim.Services.Interfaces;
-
-using PrimType = OpenSim.Region.Framework.Scenes.PrimType;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
+using PrimType = OpenSim.Region.Framework.Scenes.PrimType;
 using AssetLandmark = OpenSim.Framework.AssetLandmark;
 
 using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
@@ -917,10 +917,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public string resolveName(UUID objecUUID)
         {
             // try avatar username surname
-            CachedUserInfo profile = World.CommsManager.UserProfileCacheService.GetUserDetails(objecUUID);
-            if (profile != null && profile.UserProfile != null)
+            UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, objecUUID);
+            if (account != null)
             {
-                string avatarname = profile.UserProfile.FirstName + " " + profile.UserProfile.SurName;
+                string avatarname = account.Name;
                 return avatarname;
             }
             // try an scene object
@@ -2033,14 +2033,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y);
             bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true);
 
-            if (part.ParentGroup == null)
-            {
-                if ((targetPos.z < ground) && disable_underground_movement)
-                    targetPos.z = ground;
-                    LSL_Vector real_vec = SetPosAdjust(currentPos, targetPos);
-                    part.UpdateOffSet(new Vector3((float)real_vec.x, (float)real_vec.y, (float)real_vec.z));
-            }
-            else if (part.ParentGroup.RootPart == part)
+            if (part.ParentGroup.RootPart == part)
             {
                 if ((targetPos.z < ground) && disable_underground_movement)
                     targetPos.z = ground;
@@ -2050,7 +2043,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                //it's late... i think this is right ?
                 if (llVecDist(new LSL_Vector(0,0,0), targetPos) <= 10.0f)
                 {
                     part.OffsetPosition = new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z);
@@ -3080,9 +3072,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
 
-                m_ScriptEngine.World.AttachObject(presence.ControllingClient,
-                        grp.LocalId, (uint)attachment, Quaternion.Identity,
-                        Vector3.Zero, false);
+                IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
+                if (attachmentsModule != null)
+                    attachmentsModule.AttachObject(
+                        presence.ControllingClient, grp.LocalId, 
+                        (uint)attachment, Quaternion.Identity, Vector3.Zero, false);
             }
         }
 
@@ -3119,8 +3113,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
 
-                m_ScriptEngine.World.DetachSingleAttachmentToInv(itemID,
-                        presence.ControllingClient);
+                IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
+                if (attachmentsModule != null)
+                    attachmentsModule.ShowDetachInUserInventory(itemID, presence.ControllingClient);
             }
         }
 
@@ -4002,9 +3997,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
             }
 
-            // check if destination is an avatar
-            if (World.GetScenePresence(destId) != null)
+            // check if destination is an object
+            if (World.GetSceneObjectPart(destId) != null)
+            {
+                // destination is an object
+                World.MoveTaskInventoryItem(destId, m_host, objId);
+            }
+            else
             {
+                ScenePresence presence = World.GetScenePresence(destId);
+
+                if (presence == null)
+                {
+                    UserAccount account =
+                            World.UserAccountService.GetUserAccount(
+                            World.RegionInfo.ScopeID,
+                            destId);
+
+                    if (account == null)
+                    {
+                        llSay(0, "Can't find destination "+destId.ToString());
+                        return;
+                    }
+                }
+
                 // destination is an avatar
                 InventoryItemBase agentItem =
                         World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
@@ -4034,12 +4050,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 //This delay should only occur when giving inventory to avatars.
                 ScriptSleep(3000);
             }
-            else
-            {
-                // destination is an object
-                World.MoveTaskInventoryItem(destId, m_host, objId);
-            }
-            
         }
 
         [DebuggerNonUserCode]
@@ -4096,13 +4106,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             UUID uuid = (UUID)id;
 
-            UserProfileData userProfile =
-                    World.CommsManager.UserService.GetUserProfile(uuid);
+            UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
 
-            UserAgentData userAgent =
-                    World.CommsManager.UserService.GetAgentByUUID(uuid);
+            PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
+            PresenceInfo pinfo = PresenceInfo.GetOnlinePresence(pinfos);
 
-            if (userProfile == null || userAgent == null)
+            if (pinfo == null)
                 return UUID.Zero.ToString();
 
             string reply = String.Empty;
@@ -4111,17 +4120,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
             case 1: // DATA_ONLINE (0|1)
                 // TODO: implement fetching of this information
-                if (userProfile.CurrentAgent!=null && userProfile.CurrentAgent.AgentOnline)
+                if (pinfo != null)
                     reply = "1";
-                else
+                else 
                     reply = "0";
                 break;
             case 2: // DATA_NAME (First Last)
-                reply = userProfile.FirstName + " " + userProfile.SurName;
+                reply = account.FirstName + " " + account.LastName;
                 break;
             case 3: // DATA_BORN (YYYY-MM-DD)
                 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                born = born.AddSeconds(userProfile.Created);
+                born = born.AddSeconds(account.Created);
                 reply = born.ToString("yyyy-MM-dd");
                 break;
             case 4: // DATA_RATING (0,0,0,0,0,0)
@@ -4220,10 +4229,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             ScriptSleep(5000);
         }
 
-        public void llTextBox(string avatar, string message, int chat_channel)
+        public void llTextBox(string agent, string message, int chatChannel)
         {
+            IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
+
+            if (dm == null)
+                return;
+
             m_host.AddScriptLPS(1);
-            NotImplemented("llTextBox");
+            UUID av = new UUID();
+            if (!UUID.TryParse(agent,out av))
+            {
+                LSLError("First parameter to llDialog needs to be a key");
+                return;
+            }
+
+            if (message == string.Empty)
+            {
+                ShoutError("Trying to use llTextBox with empty message.");
+            }
+            else if (message.Length > 512)
+            {
+                ShoutError("Trying to use llTextBox with message over 512 characters.");
+            }
+            else
+            {
+                dm.SendTextBoxToUser(av, message, chatChannel, m_host.Name, m_host.UUID, m_host.OwnerID);
+                ScriptSleep(1000);
+            }
         }
 
         public void llModifyLand(int action, int brush)
@@ -4238,6 +4271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llCollisionSound(string impact_sound, double impact_volume)
         {
+
             m_host.AddScriptLPS(1);
             // TODO: Parameter check logic required.
             UUID soundId = UUID.Zero;
@@ -9091,17 +9125,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     landObject.SetMediaUrl(url);
 
                     // now send to all (non-child) agents
-                    List<ScenePresence> agents = World.GetAvatars();
-                    foreach (ScenePresence agent in agents)
+                    World.ForEachScenePresence(delegate(ScenePresence sp)
                     {
-                        agent.ControllingClient.SendParcelMediaUpdate(landData.MediaURL,
-                                                                      landData.MediaID,
-                                                                      landData.MediaAutoScale,
-                                                                      mediaType,
-                                                                      description,
-                                                                      width, height,
-                                                                      loop);
-                    }
+                        if (!sp.IsChildAgent)
+                        {
+                            sp.ControllingClient.SendParcelMediaUpdate(landData.MediaURL,
+                                                                          landData.MediaID,
+                                                                          landData.MediaAutoScale,
+                                                                          mediaType,
+                                                                          description,
+                                                                          width, height,
+                                                                          loop);
+                        }
+                    });
                 }
                 else if (!presence.IsChildAgent)
                 {
@@ -9122,13 +9158,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (presence == null)
                 {
                     // send to all (non-child) agents
-                    List<ScenePresence> agents = World.GetAvatars();
-                    foreach (ScenePresence agent in agents)
+                    World.ForEachScenePresence(delegate(ScenePresence sp)
                     {
-                        agent.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
-                                                                       (ParcelMediaCommandEnum)commandToSend,
-                                                                       time);
-                    }
+                        if (!sp.IsChildAgent)
+                        {
+                            sp.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
+                                                                           (ParcelMediaCommandEnum)commandToSend,
+                                                                           time);
+                        }
+                    });
                 }
                 else if (!presence.IsChildAgent)
                 {
@@ -10160,90 +10198,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 Notecard nc = new Notecard();
                 nc.lastRef = DateTime.Now;
-                nc.text = ParseText(text.Replace("\r", "").Split('\n'));
+                nc.text = SLUtil.ParseNotecardToList(text).ToArray();
                 m_Notecards[assetID] = nc;
             }
         }
 
-        protected static string[] ParseText(string[] input)
-        {
-            int idx = 0;
-            int level = 0;
-            List<string> output = new List<string>();
-            string[] words;
-
-            while (idx < input.Length)
-            {
-                if (input[idx] == "{")
-                {
-                    level++;
-                    idx++;
-                    continue;
-                }
-
-                if (input[idx]== "}")
-                {
-                    level--;
-                    idx++;
-                    continue;
-                }
-
-                switch (level)
-                {
-                case 0:
-                    words = input[idx].Split(' '); // Linden text ver
-                    // Notecards are created *really* empty. Treat that as "no text" (just like after saving an empty notecard)
-                    if (words.Length < 3)
-                        return new String[0];
-
-                    int version = int.Parse(words[3]);
-                    if (version != 2)
-                        return new String[0];
-                    break;
-                case 1:
-                    words = input[idx].Split(' ');
-                    if (words[0] == "LLEmbeddedItems")
-                        break;
-                    if (words[0] == "Text")
-                    {
-                        int len = int.Parse(words[2]);
-                        idx++;
-
-                        int count = -1;
-
-                        while (count < len)
-                        {
-                            // int l = input[idx].Length;
-                            string ln = input[idx];
-
-                            int need = len-count-1;
-                            if (ln.Length > need)
-                                ln = ln.Substring(0, need);
-
-                            output.Add(ln);
-                            count += ln.Length + 1;
-                            idx++;
-                        }
-
-                        return output.ToArray();
-                    }
-                    break;
-                case 2:
-                    words = input[idx].Split(' '); // count
-                    if (words[0] == "count")
-                    {
-                        int c = int.Parse(words[1]);
-                        if (c > 0)
-                            return new String[0];
-                        break;
-                    }
-                    break;
-                }
-                idx++;
-            }
-            return output.ToArray();
-        }
-
         public static bool IsCached(UUID assetID)
         {
             lock (m_Notecards)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 1ddba1e..9474bab 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -36,12 +36,11 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Framework.Console;
 using OpenSim.Region.CoreModules.Avatar.NPC;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Hypergrid;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
@@ -607,21 +606,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         // and convert the regionName to the target region
                         if (regionName.Contains(".") && regionName.Contains(":"))
                         {
+                            List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
                             // Try to link the region
-                            IHyperlinkService hyperService = World.RequestModuleInterface<IHyperlinkService>();
-                            if (hyperService != null)
+                            if (regions != null && regions.Count > 0)
                             {
-                                GridRegion regInfo = hyperService.TryLinkRegion(presence.ControllingClient,
-                                                                                regionName);
-                                // Get the region name
-                                if (regInfo != null)
-                                {
-                                    regionName = regInfo.RegionName;
-                                }
-                                else
-                                {
-                                    // Might need to ping the client here in case of failure??
-                                }
+                                GridRegion regInfo = regions[0];
+                                regionName = regInfo.RegionName;
                             }
                         }
                         presence.ControllingClient.SendTeleportLocationStart();
@@ -707,10 +697,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.None, "osGetAgents");
 
             LSL_List result = new LSL_List();
-            foreach (ScenePresence avatar in World.GetAvatars())
+            World.ForEachScenePresence(delegate(ScenePresence sp)
             {
-                result.Add(avatar.Name);
-            }
+                if (!sp.IsChildAgent)
+                    result.Add(sp.Name);
+            });
             return result;
         }
 
@@ -1482,7 +1473,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             // Create new asset
-            AssetBase asset = new AssetBase(UUID.Random(), notecardName, (sbyte)AssetType.Notecard);
+            AssetBase asset = new AssetBase(UUID.Random(), notecardName, (sbyte)AssetType.Notecard, m_host.OwnerID.ToString());
             asset.Description = "Script Generated Notecard";
             string notecardData = String.Empty;
 
@@ -1695,15 +1686,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             CheckThreatLevel(ThreatLevel.Low, "osAvatarName2Key");
 
-            CachedUserInfo userInfo = World.CommsManager.UserProfileCacheService.GetUserDetails(firstname, lastname);
-
-            if (null == userInfo)
+            UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, firstname, lastname);
+            if (null == account)
             {
                 return UUID.Zero.ToString();
             }
             else
             {
-                return userInfo.UserProfile.ID.ToString();
+                return account.PrincipalID.ToString();
             }
         }
 
@@ -1714,15 +1704,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (UUID.TryParse(id, out key))
             {
-                CachedUserInfo userInfo = World.CommsManager.UserProfileCacheService.GetUserDetails(key);
-
-                if (null == userInfo)
+                UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, key);
+                if (null == account)
                 {
                     return "";
                 }
                 else
                 {
-                    return userInfo.UserProfile.Name;
+                    return account.Name;
                 }
             }
             else
@@ -2001,19 +1990,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
             if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
             {
-                foreach (ScenePresence presence in World.GetAvatars())
+                World.ForEachScenePresence(delegate(ScenePresence sp)
                 {
-                    if ((presence.Firstname == FirstName) &&
-                        presence.Lastname == SurName)
+                    if (!sp.IsChildAgent &&
+                        sp.Firstname == FirstName &&
+                        sp.Lastname == SurName)
                     {
                         // kick client...
                         if (alert != null)
-                            presence.ControllingClient.Kick(alert);
+                            sp.ControllingClient.Kick(alert);
 
                         // ...and close on our side
-                        presence.Scene.IncomingCloseAgent(presence.UUID);
+                        sp.Scene.IncomingCloseAgent(sp.UUID);
                     }
-                }
+                });
             }
         }
         
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index b75a2e4..d354fde 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api;
@@ -204,7 +204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             // Is the sensor type is AGENT and not SCRIPTED then include agents
             if ((ts.type & AGENT) != 0 && (ts.type & SCRIPTED) == 0)
             {
-               sensedEntities.AddRange(doAgentSensor(ts));
+                sensedEntities.AddRange(doAgentSensor(ts));
             }
 
             // If SCRIPTED or PASSIVE or ACTIVE check objects
@@ -302,6 +302,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             float dz;
 
             Quaternion q = SensePoint.RotationOffset;
+            if (SensePoint.ParentGroup.RootPart.IsAttachment)
+            {
+                // In attachments, the sensor cone always orients with the
+                // avatar rotation. This may include a nonzero elevation if
+                // in mouselook.
+
+                ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
+                fromRegionPos = avatar.AbsolutePosition;
+                q = avatar.Rotation;
+            }
             LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
             LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
             double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
@@ -404,70 +414,50 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
         private List<SensedEntity> doAgentSensor(SenseRepeatClass ts)
         {
-            List<ScenePresence> presences;
             List<SensedEntity> sensedEntities = new List<SensedEntity>();
 
-            // If this is an avatar sense by key try to get them directly
-            // rather than getting a list to scan through
-            if (ts.keyID != UUID.Zero)
-            {
-                ScenePresence p = m_CmdManager.m_ScriptEngine.World.GetScenePresence(ts.keyID);
-                if (p == null)
-                    return sensedEntities;
-                presences = new List<ScenePresence>();
-                presences.Add(p);
-            }
-            else
-            {
-                presences = new List<ScenePresence>(m_CmdManager.m_ScriptEngine.World.GetScenePresences());
-            }
-
             // If nobody about quit fast
-            if (presences.Count == 0)
+            if(m_CmdManager.m_ScriptEngine.World.GetRootAgentCount() == 0)
                 return sensedEntities;
 
             SceneObjectPart SensePoint = ts.host;
-
             Vector3 fromRegionPos = SensePoint.AbsolutePosition;
-
             Quaternion q = SensePoint.RotationOffset;
+            if (SensePoint.ParentGroup.RootPart.IsAttachment)
+            {
+                // In attachments, the sensor cone always orients with the
+                // avatar rotation. This may include a nonzero elevation if
+                // in mouselook.
+
+                ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
+                fromRegionPos = avatar.AbsolutePosition;
+                q = avatar.Rotation;
+            }
             LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
             LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
             double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
-
             bool attached = (SensePoint.AttachmentPoint != 0);
-            bool nameSearch = (ts.name != null && ts.name != "");
             Vector3 toRegionPos;
             double dis;
 
-            for (int i = 0; i < presences.Count; i++)
+            Action<ScenePresence> senseEntity = new Action<ScenePresence>(delegate(ScenePresence presence)
             {
-                ScenePresence presence = presences[i];
-                bool keep = true;
+                if (presence.IsDeleted || presence.IsChildAgent || presence.GodLevel > 0.0)
+                    return;
+                
+                // if the object the script is in is attached and the avatar is the owner
+                // then this one is not wanted
+                if (attached && presence.UUID == SensePoint.OwnerID)
+                    return;
 
-                if (presence.IsDeleted)
-                    continue;
-
-                if (presence.IsChildAgent)
-                    keep = false;
                 toRegionPos = presence.AbsolutePosition;
-
                 dis = Math.Abs(Util.GetDistanceTo(toRegionPos, fromRegionPos));
 
                 // are they in range
-                if (keep && dis <= ts.range)
+                if (dis <= ts.range)
                 {
-                    // if the object the script is in is attached and the avatar is the owner
-                    // then this one is not wanted
-                    if (attached && presence.UUID == SensePoint.OwnerID)
-                        keep = false;
-
-                    // check the name if needed
-                    if (keep && nameSearch && ts.name != presence.Name)
-                        keep = false;
-
                     // Are they in the required angle of view
-                    if (keep && ts.arc < Math.PI)
+                    if (ts.arc < Math.PI)
                     {
                         // not omni-directional. Can you see it ?
                         // vec forward_dir = llRot2Fwd(llGetRot())
@@ -488,26 +478,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                         catch
                         {
                         }
-                        if (ang_obj > ts.arc) keep = false;
+                        if (ang_obj <= ts.arc)
+                        {
+                            sensedEntities.Add(new SensedEntity(dis, presence.UUID));
+                        }
+                    }
+                    else
+                    {
+                        // If full circle is asked for, just add it
+                        sensedEntities.Add(new SensedEntity(dis, presence.UUID));
                     }
                 }
-                else
-                {
-                    keep = false;
-                }
-
-                // Do not report gods, not even minor ones
-                if (keep && presence.GodLevel > 0.0)
-                    keep = false;
-
-                if (keep) // add to list with distance
-                {
-                    sensedEntities.Add(new SensedEntity(dis, presence.UUID));
-                }
+            });
 
-                // If this is a search by name and we have just found it then no more to do 
-                if (nameSearch && ts.name == presence.Name)
+            // If this is an avatar sense by key try to get them directly
+            // rather than getting a list to scan through
+            if (ts.keyID != UUID.Zero)
+            {
+                ScenePresence sp;
+                // Try direct lookup by UUID
+                if(!m_CmdManager.m_ScriptEngine.World.TryGetScenePresence(ts.keyID, out sp))
                     return sensedEntities;
+                senseEntity(sp);
+            }
+            else if (ts.name != null && ts.name != "")
+            {
+                ScenePresence sp;
+                // Try lookup by name will return if/when found
+                if (!m_CmdManager.m_ScriptEngine.World.TryGetAvatarByName(ts.name, out sp))
+                    return sensedEntities;
+                senseEntity(sp);
+            }
+            else
+            {
+                m_CmdManager.m_ScriptEngine.World.ForEachScenePresence(senseEntity);
             }
             return sensedEntities;
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
index 6239726..fba27f9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
@@ -1,4 +1,31 @@
-using System.Collections;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections;
 using OpenSim.Region.ScriptEngine.Interfaces;
 
 using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
index 522c020..f94ef4a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int WL_CLOUD_SCROLL_Y = 32;
         public const int WL_CLOUD_SCROLL_Y_LOCK = 33;
         public const int WL_CLOUD_SCROLL_X_LOCK = 34;
-        public const int WL_DRAW_CLASSIC_CLOUDS = 35;

+        public const int WL_DRAW_CLASSIC_CLOUDS = 35;
         public const int WL_SUN_MOON_POSITION = 36;
 
     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index b3e4740..96f6486 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -549,5 +549,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int STATS_ACTIVE_SCRIPTS = 19;
         public const int STATS_SCRIPT_LPS = 20;
 
+        public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
+        public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
     }
 }