8 files changed, 283 insertions, 222 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index cadb858..1875c48 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ScenePresence avatar;
 
-            if (TryGetAvatar(avatarId, out avatar))
+            if (TryGetScenePresence(avatarId, out avatar))
             {
                 IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
                 if (invAccess != null)
@@ -230,7 +230,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ScenePresence avatar;
 
-            if (TryGetAvatar(avatarId, out avatar))
+            if (TryGetScenePresence(avatarId, out avatar))
             {
                 return CapsUpdateTaskInventoryScriptAsset(
                     avatar.ControllingClient, itemId, primId, isScriptRunning, data);
@@ -683,7 +683,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (transactionID == UUID.Zero)
             {
                 ScenePresence presence;
-                if (TryGetAvatar(remoteClient.AgentId, out presence))
+                if (TryGetScenePresence(remoteClient.AgentId, out presence))
                 {
                     byte[] data = null;
 
@@ -945,7 +945,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ScenePresence avatar;
 
-            if (TryGetAvatar(avatarId, out avatar))
+            if (TryGetScenePresence(avatarId, out avatar))
             {
                 return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId);
             }
@@ -1059,7 +1059,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             ScenePresence avatar;
 
-            if (TryGetAvatar(srcTaskItem.OwnerID, out avatar))
+            if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar))
             {
                 destPart.GetProperties(avatar.ControllingClient);
             }
@@ -1087,7 +1087,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             ScenePresence avatar = null;
-            if (TryGetAvatar(destID, out avatar))
+            if (TryGetScenePresence(destID, out avatar))
             {
                 //profile.SendInventoryDecendents(avatar.ControllingClient,
                 //        profile.RootFolder.ID, true, false);
@@ -1424,7 +1424,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             ScenePresence avatar;
 
-            if (TryGetAvatar(srcTaskItem.OwnerID, out avatar))
+            if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar))
             {
                 destPart.GetProperties(avatar.ControllingClient);
             }
@@ -1865,7 +1865,7 @@ namespace OpenSim.Region.Framework.Scenes
             UUID inventoryID = part.ParentGroup.GetFromItemID();
 
             ScenePresence presence;
-            if (TryGetAvatar(remoteClient.AgentId, out presence))
+            if (TryGetScenePresence(remoteClient.AgentId, out presence))
             {
                 if (!Permissions.CanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition))
                     return;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b2c8dfd..2b6f80b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -606,7 +606,46 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (m_storageManager.EstateDataStore != null)
             {
-                m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID);
+                m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID, false);
+                if (m_regInfo.EstateSettings.EstateID == 0) // No record at all
+                {
+                    MainConsole.Instance.Output("Your region is not part of an estate.");
+                    while (true)
+                    {
+                        string response = MainConsole.Instance.CmdPrompt("Do you wish to join an existing estate?", "no", new List<string>() {"yes", "no"});
+                        if (response == "no")
+                        {
+                            // Create a new estate
+                            m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID, true);
+
+                            m_regInfo.EstateSettings.EstateName = MainConsole.Instance.CmdPrompt("New estate name", m_regInfo.EstateSettings.EstateName);
+                            m_regInfo.EstateSettings.Save();
+                            break;
+                        }
+                        else
+                        {
+                            response = MainConsole.Instance.CmdPrompt("Estate name to join", "None");
+                            if (response == "None")
+                                continue;
+
+                            List<int> estateIDs = m_storageManager.EstateDataStore.GetEstates(response);
+                            if (estateIDs.Count < 1)
+                            {
+                                MainConsole.Instance.Output("The name you have entered matches no known estate. Please try again");
+                                continue;
+                            }
+
+                            int estateID = estateIDs[0];
+
+                            m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(estateID);
+
+                            if (m_storageManager.EstateDataStore.LinkRegion(m_regInfo.RegionID, estateID))
+                                break;
+
+                            MainConsole.Instance.Output("Joining the estate failed. Please try again.");
+                        }
+                    }
+                }
             }
 
             //Bind Storage Manager functions to some land manager functions for this scene
@@ -1229,6 +1268,84 @@ namespace OpenSim.Region.Framework.Scenes
             m_dialogModule = RequestModuleInterface<IDialogModule>();
             m_capsModule = RequestModuleInterface<ICapabilitiesModule>();
             m_teleportModule = RequestModuleInterface<IEntityTransferModule>();
+
+            // Shoving this in here for now, because we have the needed
+            // interfaces at this point
+            //
+            // TODO: Find a better place for this
+            //
+            while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
+            {
+                MainConsole.Instance.Output("The current estate has no owner set.");
+                string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test");
+                string last = MainConsole.Instance.CmdPrompt("Estate owner last name", "User");
+
+                UserAccount account = UserAccountService.GetUserAccount(m_regInfo.ScopeID, first, last);
+
+                if (account == null)
+                {
+                    // Create a new account
+                    account = new UserAccount(m_regInfo.ScopeID, first, last, String.Empty);
+                    if (account.ServiceURLs == null || (account.ServiceURLs != null && account.ServiceURLs.Count == 0))
+                    {
+                        account.ServiceURLs = new Dictionary<string, object>();
+                        account.ServiceURLs["HomeURI"] = string.Empty;
+                        account.ServiceURLs["GatekeeperURI"] = string.Empty;
+                        account.ServiceURLs["InventoryServerURI"] = string.Empty;
+                        account.ServiceURLs["AssetServerURI"] = string.Empty;
+                    }
+
+                    if (UserAccountService.StoreUserAccount(account))
+                    {
+                        string password = MainConsole.Instance.PasswdPrompt("Password");
+                        string email = MainConsole.Instance.CmdPrompt("Email", "");
+
+                        account.Email = email;
+                        UserAccountService.StoreUserAccount(account);
+
+                        bool success = false;
+                        success = AuthenticationService.SetPassword(account.PrincipalID, password);
+                        if (!success)
+                            m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set password for account {0} {1}.",
+                               first, last);
+
+                        GridRegion home = null;
+                        if (GridService != null)
+                        {
+                            List<GridRegion> defaultRegions = GridService.GetDefaultRegions(UUID.Zero);
+                            if (defaultRegions != null && defaultRegions.Count >= 1)
+                                home = defaultRegions[0];
+
+                            if (PresenceService != null && home != null)
+                                PresenceService.SetHomeLocation(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
+                            else
+                                m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set home for account {0} {1}.",
+                                   first, last);
+
+                        }
+                        else
+                            m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to retrieve home region for account {0} {1}.",
+                               first, last);
+
+                        if (InventoryService != null)
+                            success = InventoryService.CreateUserInventory(account.PrincipalID);
+                        if (!success)
+                            m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to create inventory for account {0} {1}.",
+                               first, last);
+
+
+                        m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", first, last);
+
+                        m_regInfo.EstateSettings.EstateOwner = account.PrincipalID;
+                        m_regInfo.EstateSettings.Save();
+                    }
+                }
+                else
+                {
+                    m_regInfo.EstateSettings.EstateOwner = account.PrincipalID;
+                    m_regInfo.EstateSettings.Save();
+                }
+            }
         }
 
         #endregion
@@ -3296,7 +3413,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
+            ScenePresence sp = GetScenePresence(agent.AgentID);
             if (sp != null)
             {
                 m_log.DebugFormat(
@@ -3594,8 +3711,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="message">message to display to the user.  Reason for being logged off</param>
         public void HandleLogOffUserFromGrid(UUID AvatarID, UUID RegionSecret, string message)
         {
-            ScenePresence loggingOffUser = null;
-            loggingOffUser = GetScenePresence(AvatarID);
+            ScenePresence loggingOffUser = GetScenePresence(AvatarID);
             if (loggingOffUser != null)
             {
                 UUID localRegionSecret = UUID.Zero;
@@ -3631,8 +3747,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="isFlying"></param>
         public virtual void AgentCrossing(UUID agentID, Vector3 position, bool isFlying)
         {
-            ScenePresence presence;
-            if(m_sceneGraph.TryGetAvatar(agentID, out presence))
+            ScenePresence presence = GetScenePresence(agentID);
+            if(presence != null)
             {
                 try
                 {
@@ -3806,8 +3922,8 @@ namespace OpenSim.Region.Framework.Scenes
         public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, Vector3 position,
                                             Vector3 lookAt, uint teleportFlags)
         {
-            ScenePresence sp;
-            if(m_sceneGraph.TryGetAvatar(remoteClient.AgentId, out sp))
+            ScenePresence sp = GetScenePresence(remoteClient.AgentId);
+            if (sp != null)
             {
                 uint regionX = m_regInfo.RegionLocX;
                 uint regionY = m_regInfo.RegionLocY;
@@ -3985,17 +4101,17 @@ namespace OpenSim.Region.Framework.Scenes
                     m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname",
                                       "Agent ID", "Session ID", "Circuit", "IP", "World");
 
-                    foreach (ScenePresence scenePresence in GetAvatars())
+                    ForEachScenePresence(delegate(ScenePresence sp)
                     {
                         m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
-                                          scenePresence.Firstname,
-                                          scenePresence.Lastname,
-                                          scenePresence.UUID,
-                                          scenePresence.ControllingClient.AgentId,
+                                          sp.Firstname,
+                                          sp.Lastname,
+                                          sp.UUID,
+                                          sp.ControllingClient.AgentId,
                                           "Unknown",
                                           "Unknown",
                                           RegionInfo.RegionName);
-                    }
+                    });
 
                     break;
             }
@@ -4161,72 +4277,42 @@ namespace OpenSim.Region.Framework.Scenes
             m_sceneGraph.RemovePhysicalPrim(num);
         }
 
-        //The idea is to have a group of method that return a list of avatars meeting some requirement
-        // ie it could be all m_scenePresences within a certain range of the calling prim/avatar.
-        // 
-        // GetAvatars returns a new list of all root agent presences in the scene
-        // GetScenePresences returns a new list of all presences in the scene or a filter may be passed.
-        // GetScenePresence returns the presence with matching UUID or first/last name.
-        // ForEachScenePresence requests the Scene to run a delegate function against all presences.
-
-        /// <summary>
-        /// Return a list of all avatars in this region.
-        /// This list is a new object, so it can be iterated over without locking.
-        /// </summary>
-        /// <returns></returns>
-        public List<ScenePresence> GetAvatars()
+        public int GetRootAgentCount()
         {
-            return m_sceneGraph.GetAvatars();
+            return m_sceneGraph.GetRootAgentCount();
         }
 
-        /// <summary>
-        /// Return a list of all ScenePresences in this region.  This returns child agents as well as root agents.
-        /// This list is a new object, so it can be iterated over without locking.
-        /// </summary>
-        /// <returns></returns>
-        public List<ScenePresence> GetScenePresences()
+        public int GetChildAgentCount()
         {
-            return m_sceneGraph.GetScenePresences();
+            return m_sceneGraph.GetChildAgentCount();
         }
 
         /// <summary>
-        /// Request a filtered list of ScenePresences in this region.
-        /// This list is a new object, so it can be iterated over without locking.
+        /// Request a scene presence by UUID. Fast, indexed lookup.
         /// </summary>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        public List<ScenePresence> GetScenePresences(FilterAvatarList filter)
-        {
-            return m_sceneGraph.GetScenePresences(filter);
-        }
-
-        /// <summary>
-        /// Request a scene presence by UUID
-        /// </summary>
-        /// <param name="avatarID"></param>
-        /// <returns></returns>
-        public ScenePresence GetScenePresence(UUID avatarID)
+        /// <param name="agentID"></param>
+        /// <returns>null if the presence was not found</returns>
+        public ScenePresence GetScenePresence(UUID agentID)
         {
-            return m_sceneGraph.GetScenePresence(avatarID);
+            return m_sceneGraph.GetScenePresence(agentID);
         }
 
         /// <summary>
-        /// Request the ScenePresence in this region by first/last name.
-        /// Should normally only be a single match, but first is always returned
+        /// Request the scene presence by name.
         /// </summary>
         /// <param name="firstName"></param>
         /// <param name="lastName"></param>
-        /// <returns></returns>
+        /// <returns>null if the presence was not found</returns>
         public ScenePresence GetScenePresence(string firstName, string lastName)
         {
             return m_sceneGraph.GetScenePresence(firstName, lastName);
         }
 
         /// <summary>
-        /// Request the ScenePresence in this region by localID.
+        /// Request the scene presence by localID.
         /// </summary>
         /// <param name="localID"></param>
-        /// <returns></returns>
+        /// <returns>null if the presence was not found</returns>
         public ScenePresence GetScenePresence(uint localID)
         {
             return m_sceneGraph.GetScenePresence(localID);
@@ -4318,9 +4404,9 @@ namespace OpenSim.Region.Framework.Scenes
             return m_sceneGraph.GetGroupByPrim(localID);
         }
 
-        public override bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
+        public override bool TryGetScenePresence(UUID avatarId, out ScenePresence avatar)
         {
-            return m_sceneGraph.TryGetAvatar(avatarId, out avatar);
+            return m_sceneGraph.TryGetScenePresence(avatarId, out avatar);
         }
 
         public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 74476ed..3218dad 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -190,11 +190,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="agentID"></param>
         public abstract void RemoveClient(UUID agentID);
 
-        public bool TryGetAvatar(UUID agentID, out object scenePresence)
+        public bool TryGetScenePresence(UUID agentID, out object scenePresence)
         {
             scenePresence = null;
             ScenePresence sp = null;
-            if (TryGetAvatar(agentID, out sp))
+            if (TryGetScenePresence(agentID, out sp))
             {
                 scenePresence = sp;
                 return true;
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Framework.Scenes
             return false;
         }
 
-        public abstract bool TryGetAvatar(UUID agentID, out ScenePresence scenePresence);
+        public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence);
 
         #endregion
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 19298d2..3a1962c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -723,116 +723,84 @@ namespace OpenSim.Region.Framework.Scenes
             return null;
         }
 
-        // The idea is to have a group of method that return a list of avatars meeting some requirement
-        // ie it could be all m_scenePresences within a certain range of the calling prim/avatar.
-        // 
-        // GetAvatars returns a new list of all root agent presences in the scene
-        // GetScenePresences returns a new list of all presences in the scene or a filter may be passed.
-        // GetScenePresence returns the presence with matching UUID or the first presence matching the passed filter.
-        // ForEachScenePresence requests the Scene to run a delegate function against all presences.
-
         /// <summary>
-        /// Request a list of all avatars in this region (no child agents)
-        /// This list is a new object, so it can be iterated over without locking.
+        /// Request a copy of m_scenePresences in this World
+        /// There is no guarantee that presences will remain in the scene after the list is returned.
+        /// This list should remain private to SceneGraph. Callers wishing to iterate should instead
+        /// pass a delegate to ForEachScenePresence.
         /// </summary>
         /// <returns></returns>
-        public List<ScenePresence> GetAvatars()
+        private List<ScenePresence> GetScenePresences()
         {
-            return GetScenePresences(delegate(ScenePresence scenePresence)
-            {
-                return !scenePresence.IsChildAgent;
-            });
+            lock (m_scenePresences)
+                return new List<ScenePresence>(m_scenePresenceArray);
         }
 
         /// <summary>
-        /// Request a list of m_scenePresences in this World
-        /// Returns a copy so it can be iterated without a lock.
-        /// There is no guarantee that presences will remain in the scene after the list is returned.
+        /// Request a scene presence by UUID. Fast, indexed lookup.
         /// </summary>
-        /// <returns></returns>
-        protected internal List<ScenePresence> GetScenePresences()
+        /// <param name="agentID"></param>
+        /// <returns>null if the presence was not found</returns>
+        protected internal ScenePresence GetScenePresence(UUID agentID)
         {
-            List<ScenePresence> result;
+            ScenePresence sp;
             lock (m_scenePresences)
             {
-                result = new List<ScenePresence>(m_scenePresenceArray.Length);
-                result.AddRange(m_scenePresenceArray);
+                m_scenePresences.TryGetValue(agentID, out sp);
             }
-            return result;
+            return sp;
         }
 
         /// <summary>
-        /// Request a filtered list of m_scenePresences in this World
-        /// Returns a copy so it can be iterated without a lock.
-        /// There is no guarantee that presences will remain in the scene after the list is returned.
+        /// Request the scene presence by name.
         /// </summary>
-        /// <returns></returns>
-        protected internal List<ScenePresence> GetScenePresences(FilterAvatarList filter)
+        /// <param name="firstName"></param>
+        /// <param name="lastName"></param>
+        /// <returns>null if the presence was not found</returns>
+        protected internal ScenePresence GetScenePresence(string firstName, string lastName)
         {
-            List<ScenePresence> result = new List<ScenePresence>();
-            // Check each ScenePresence against the filter
-            ForEachScenePresence(delegate(ScenePresence presence)
+            foreach (ScenePresence presence in GetScenePresences())
             {
-                if (filter(presence))
-                    result.Add(presence);
-            });
-            return result;
+                if (presence.Firstname == firstName && presence.Lastname == lastName)
+                    return presence;
+            }
+            return null;
         }
 
         /// <summary>
-        /// Request the ScenePresence in this region matching filter. 
-        /// Only the first match is returned. 
-        /// 
+        /// Request the scene presence by localID.
         /// </summary>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        protected internal ScenePresence GetScenePresence(FilterAvatarList filter)
+        /// <param name="localID"></param>
+        /// <returns>null if the presence was not found</returns>
+        protected internal ScenePresence GetScenePresence(uint localID)
         {
-            ScenePresence result = null;
-            // Get all of the ScenePresences
-            List<ScenePresence> presences = GetScenePresences();
-            foreach (ScenePresence presence in presences)
-            {
-                if (filter(presence))
-                {
-                    result = presence;
-                    break;
-                }
-            }
-            return result;
+            foreach (ScenePresence presence in GetScenePresences())
+                if (presence.LocalId == localID)
+                    return presence;
+            return null;
         }
 
-        protected internal ScenePresence GetScenePresence(string firstName, string lastName)
+        protected internal bool TryGetScenePresence(UUID agentID, out ScenePresence avatar)
         {
-            return GetScenePresence(delegate(ScenePresence presence)
+            lock (m_scenePresences)
             {
-                return(presence.Firstname == firstName && presence.Lastname == lastName);
-            });
-        }
-
-        /// <summary>
-        /// Request a scene presence by UUID
-        /// </summary>
-        /// <param name="agentID"></param>
-        /// <returns>null if the agent was not found</returns>
-        protected internal ScenePresence GetScenePresence(UUID agentID)
-        {
-            ScenePresence sp;
-            TryGetAvatar(agentID, out sp);
-            return sp;
+                m_scenePresences.TryGetValue(agentID, out avatar);
+            }
+            return (avatar != null);
         }
 
-        /// <summary>
-        /// Request the ScenePresence in this region by localID.
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <returns></returns>
-        protected internal ScenePresence GetScenePresence(uint localID)
+        protected internal bool TryGetAvatarByName(string name, out ScenePresence avatar)
         {
-            return GetScenePresence(delegate(ScenePresence presence)
+            avatar = null;
+            foreach (ScenePresence presence in GetScenePresences())
             {
-                return (presence.LocalId == localID);
-            });
+                if (String.Compare(name, presence.ControllingClient.Name, true) == 0)
+                {
+                    avatar = presence;
+                    break;
+                }
+            }
+            return (avatar != null);
         }
 
         /// <summary>
@@ -986,24 +954,6 @@ namespace OpenSim.Region.Framework.Scenes
             return group.GetChildPart(fullID);
         }
 
-        protected internal bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
-        {
-            lock (m_scenePresences)
-            {
-                m_scenePresences.TryGetValue(avatarId, out avatar);
-            }
-            return (avatar != null);
-        }
-
-        protected internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
-        {
-            avatar = GetScenePresence(delegate(ScenePresence presence)
-            {
-                return (String.Compare(avatarName, presence.ControllingClient.Name, true) == 0);
-            });
-            return (avatar != null);
-        }
-
         /// <summary>
         /// Returns a list of the entities in the scene.  This is a new list so no locking is required to iterate over
         /// it
@@ -1066,6 +1016,10 @@ namespace OpenSim.Region.Framework.Scenes
                 return UUID.Zero;
         }
 
+        /// <summary>
+        /// Performs action on all scene object groups.
+        /// </summary>
+        /// <param name="action"></param>
         protected internal void ForEachSOG(Action<SceneObjectGroup> action)
         {
             List<SceneObjectGroup> objlist = new List<SceneObjectGroup>(SceneObjectGroupsByFullID.Values);
@@ -1085,23 +1039,41 @@ namespace OpenSim.Region.Framework.Scenes
 
         
         /// <summary>
-        /// Performs action on all scene presences.
+        /// Performs action on all scene presences. This can ultimately run the actions in parallel but
+        /// any delegates passed in will need to implement their own locking on data they reference and
+        /// modify outside of the scope of the delegate. 
         /// </summary>
         /// <param name="action"></param>
         public void ForEachScenePresence(Action<ScenePresence> action)
         {
-            List<ScenePresence> presences = GetScenePresences();
-            try
+            // Once all callers have their delegates configured for parallelism, we can unleash this
+            /*
+            Action<ScenePresence> protectedAction = new Action<ScenePresence>(delegate(ScenePresence sp)
+                {
+                    try
+                    {
+                        action(sp);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString());
+                        m_log.Info("[BUG] Stack Trace: " + e.StackTrace);
+                    }
+                });
+            Parallel.ForEach<ScenePresence>(GetScenePresences(), protectedAction);
+            */
+            // For now, perform actiona serially
+            foreach (ScenePresence sp in GetScenePresences())
             {
-                foreach(ScenePresence presence in presences)
+                try
                 {
-                    action(presence);
+                    action(sp);
+                }
+                catch (Exception e)
+                {
+                    m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString());
+                    m_log.Info("[BUG] Stack Trace: " + e.StackTrace);
                 }
-            }
-            catch (Exception e)
-            {
-                m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString());
-                m_log.Info("[BUG] Stack Trace: " + e.StackTrace);
             }
         }
         
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index a955532..3b84734 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -454,8 +454,10 @@ namespace OpenSim.Region.Framework.Scenes
 
             ForEachCurrentScene(delegate(Scene scene)
             {
-                List<ScenePresence> scenePresences = scene.GetScenePresences();
-                presences.AddRange(scenePresences);
+                scene.ForEachScenePresence(delegate(ScenePresence sp)
+                {
+                    presences.Add(sp);
+                });
             });
 
             return presences;
@@ -484,11 +486,11 @@ namespace OpenSim.Region.Framework.Scenes
             ForEachCurrentScene(delegate(Scene scene) { scene.HandleEditCommand(cmdparams); });
         }
 
-        public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
+        public bool TryGetScenePresence(UUID avatarId, out ScenePresence avatar)
         {
             foreach (Scene scene in m_localScenes)
             {
-                if (scene.TryGetAvatar(avatarId, out avatar))
+                if (scene.TryGetScenePresence(avatarId, out avatar))
                 {
                     return true;
                 }
@@ -503,7 +505,7 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence avatar = null;
             foreach (Scene mScene in m_localScenes)
             {
-                if (mScene.TryGetAvatar(avatarId, out avatar))
+                if (mScene.TryGetScenePresence(avatarId, out avatar))
                 {
                     scene = mScene;
                     return true;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 539f2b1..4b2641c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -682,7 +682,7 @@ namespace OpenSim.Region.Framework.Scenes
                     if (m_parentGroup != null) // TODO can there be a SOP without a SOG?
                     {
                         ScenePresence avatar;
-                        if (m_parentGroup.Scene.TryGetAvatar(m_sitTargetAvatar, out avatar))
+                        if (m_parentGroup.Scene.TryGetScenePresence(m_sitTargetAvatar, out avatar))
                         {
                             avatar.ParentPosition = GetWorldPosition();
                         }
@@ -1332,11 +1332,11 @@ namespace OpenSim.Region.Framework.Scenes
             if (volume < 0)
                 volume = 0;
 
-            List<ScenePresence> avatarts = m_parentGroup.Scene.GetAvatars();
-            foreach (ScenePresence p in avatarts)
+            m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp)
             {
-                p.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume);
-            }
+                if(!sp.IsChildAgent)
+                    sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume);
+            });
         }
 
         /// <summary>
@@ -2626,12 +2626,13 @@ namespace OpenSim.Region.Framework.Scenes
                 TaskInventory.LockItemsForRead(false);
             }
 
-            List<ScenePresence> avatarts = m_parentGroup.Scene.GetAvatars();
-            foreach (ScenePresence p in avatarts)
+            m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp)
             {
-                if (!(Util.GetDistanceTo(p.AbsolutePosition, AbsolutePosition) >= 100))
-                    p.ControllingClient.SendPreLoadSound(objectID, objectID, soundID);
-            }
+                if (sp.IsChildAgent)
+                    return;
+                if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100))
+                    sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID);
+            });
         }
 
         public void RemFlag(PrimFlags flag)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1e530e1..5c54616 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2598,35 +2598,33 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
 
             List<Vector3> CoarseLocations = new List<Vector3>();
             List<UUID> AvatarUUIDs = new List<UUID>();
-            List<ScenePresence> avatars = m_scene.GetAvatars();
-            for (int i = 0; i < avatars.Count; i++)
+            m_scene.ForEachScenePresence(delegate(ScenePresence sp)
             {
-                // Requested by LibOMV.   Send Course Location on self.
-                //if (avatars[i] != this)
-                //{
-                    if (avatars[i].ParentID != 0)
+                if (sp.IsChildAgent)
+                    return;
+
+                if (sp.ParentID != 0)
+                {
+                    // sitting avatar
+                    SceneObjectPart sop = m_scene.GetSceneObjectPart(sp.ParentID);
+                    if (sop != null)
                     {
-                        // sitting avatar
-                        SceneObjectPart sop = m_scene.GetSceneObjectPart(avatars[i].ParentID);
-                        if (sop != null)
-                        {
-                            CoarseLocations.Add(sop.AbsolutePosition + avatars[i].m_pos);
-                            AvatarUUIDs.Add(avatars[i].UUID);
-                        }
-                        else
-                        {
-                            // we can't find the parent..  ! arg!
-                            CoarseLocations.Add(avatars[i].m_pos);
-                            AvatarUUIDs.Add(avatars[i].UUID);
-                        }
+                        CoarseLocations.Add(sop.AbsolutePosition + sp.m_pos);
+                        AvatarUUIDs.Add(sp.UUID);
                     }
                     else
                     {
-                        CoarseLocations.Add(avatars[i].m_pos);
-                        AvatarUUIDs.Add(avatars[i].UUID);
+                        // we can't find the parent..  ! arg!
+                        CoarseLocations.Add(sp.m_pos);
+                        AvatarUUIDs.Add(sp.UUID);
                     }
-                //}
-            }
+                }
+                else
+                {
+                    CoarseLocations.Add(sp.m_pos);
+                    AvatarUUIDs.Add(sp.UUID);
+                }
+            });
 
             m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations);
 
@@ -2700,13 +2698,15 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
             m_perfMonMS = Util.EnvironmentTickCount();
 
             // only send update from root agents to other clients; children are only "listening posts"
-            List<ScenePresence> avatars = m_scene.GetAvatars();
-            foreach (ScenePresence avatar in avatars)
+            int count = 0;
+            m_scene.ForEachScenePresence(delegate(ScenePresence sp)
             {
-                SendFullUpdateToOtherClient(avatar);
-
-            }
-            m_scene.StatsReporter.AddAgentUpdates(avatars.Count);
+                if (sp.IsChildAgent)
+                    return;
+                SendFullUpdateToOtherClient(sp);
+                ++count;
+            });
+            m_scene.StatsReporter.AddAgentUpdates(count);
             m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
 
             Animator.SendAnimPack();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
index 840039c..dd9f8f6 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 throw new NotImplementedException();
             }
 
-            public override bool TryGetAvatar(UUID agentID, out ScenePresence scenePresence)
+            public override bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence)
             {
                 throw new NotImplementedException();
             }