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

OpenSim/Client/MXP/ClientStack/MXPClientView.cs

@@ -598,6 +598,7 @@ namespace OpenSim.Client.MXP.ClientStack
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall2 OnRequestWearables;
         public event GenericCall1 OnCompleteMovementToRegion;
+        public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;

OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs

@@ -244,6 +244,7 @@ namespace OpenSim.Client.Sirikata.ClientStack
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall2 OnRequestWearables;
         public event GenericCall1 OnCompleteMovementToRegion;
+        public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;

OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs

@@ -247,6 +247,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
         public event Action<IClientAPI> OnRegionHandShakeReply = delegate { };
         public event GenericCall2 OnRequestWearables = delegate { };
         public event GenericCall1 OnCompleteMovementToRegion = delegate { };
+        public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate = delegate { };
         public event AgentRequestSit OnAgentRequestSit = delegate { };
         public event AgentSit OnAgentSit = delegate { };

OpenSim/Data/IGridUserData.cs

@@ -44,7 +44,7 @@ namespace OpenSim.Data
     /// </summary>
     public interface IGridUserData 
     {
-        GridUserData GetGridUserData(string userID);        
+        GridUserData GetGridUserData(string userID);
         bool StoreGridUserData(GridUserData data);
     }
 }

OpenSim/Data/MSSQL/MSSQLAvatarData.cs

@@ -47,7 +47,7 @@ namespace OpenSim.Data.MSSQL
         
         public MSSQLAvatarData(string connectionString, string realm) :
                 base(connectionString, realm, "Avatar")
-        {            
+        {
         }
 
         public bool Delete(UUID principalID, string name)

OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs

@@ -110,7 +110,7 @@ namespace OpenSim.Data.MSSQL
         {
             List<string> constraints = new List<string>();
             string query = string.Format(@"SELECT 
-                            COL_NAME(ic.object_id,ic.column_id) AS column_name                                
+                            COL_NAME(ic.object_id,ic.column_id) AS column_name
                             FROM sys.indexes AS i
                             INNER JOIN sys.index_columns AS ic 
                               ON i.object_id = ic.object_id AND i.index_id = ic.index_id
@@ -157,7 +157,7 @@ namespace OpenSim.Data.MSSQL
                 string where = String.Join(" AND ", terms.ToArray());
 
                 string query = String.Format("SELECT * FROM {0} WHERE {1}",
-                        m_Realm, where);                
+                        m_Realm, where);
 
                 cmd.Connection = conn;
                 cmd.CommandText = query;
@@ -296,7 +296,7 @@ namespace OpenSim.Data.MSSQL
                 query.AppendFormat("[{0}] = {1} ", names[i], values[i]);
                 if (constraints.Count > 0)
                 {
-                    List<string> terms = new List<string>();       
+                    List<string> terms = new List<string>();
                     for (int j = 0; j < constraints.Count; j++)
                     {
                         terms.Add(" [" + constraints[j].Key + "] = @" + constraints[j].Key);

OpenSim/Data/MSSQL/MSSQLGridUserData.cs

@@ -47,7 +47,7 @@ namespace OpenSim.Data.MSSQL
 
         public MSSQLGridUserData(string connectionString, string realm) :
             base(connectionString, realm, "UserGrid")
-        {            
+        {
         }
 
         public GridUserData GetGridUserData(string userID)
@@ -58,7 +58,7 @@ namespace OpenSim.Data.MSSQL
                 return null;
 
             return ret[0];
-        }   
+        }
 
         public bool StoreGridUserData(GridUserData data)
         {

OpenSim/Data/MSSQL/MSSQLManager.cs

@@ -46,7 +46,7 @@ namespace OpenSim.Data.MSSQL
         /// <summary>
         /// Connection string for ADO.net
         /// </summary>
-        private readonly string connectionString;      
+        private readonly string connectionString;
 
         /// <summary>
         /// Initialize the manager and set the connectionstring
@@ -196,7 +196,7 @@ namespace OpenSim.Data.MSSQL
 
                 migration.Update();
             }
-        }        
+        }
 
         /// <summary>
         /// Returns the version of this DB provider

OpenSim/Data/MSSQL/MSSQLUserAccountData.cs

@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
         {
         }
         //private string m_Realm;
-        //private List<string> m_ColumnNames = null;        
+        //private List<string> m_ColumnNames = null;
         //private MSSQLManager m_database;
 
         //public MSSQLUserAccountData(string connectionString, string realm)

OpenSim/Data/MySQL/MySQLGenericTableHandler.cs

@@ -197,7 +197,7 @@ namespace OpenSim.Data.MySQL
         public virtual T[] Get(string where)
         {
             using (MySqlCommand cmd = new MySqlCommand())
-            {            
+            {
                 string query = String.Format("select * from {0} where {1}",
                                              m_Realm, where);
                 

OpenSim/Data/MySQL/MySQLGridUserData.cs

@@ -54,7 +54,7 @@ namespace OpenSim.Data.MySQL
                 return null;
 
             return ret[0];
-        }        
+        }
 
         public bool StoreGridUserData(GridUserData data)
         {

OpenSim/Data/MySQL/MySQLPresenceData.cs

@@ -134,7 +134,7 @@ namespace OpenSim.Data.MySQL
                     List<UUID> deleteSessions = new List<UUID>();
                     int online = 0;
 
-                    while(reader.Read())
+                    while (reader.Read())
                     {
                         if (bool.Parse(reader["Online"].ToString()))
                             online++;

OpenSim/Data/Null/NullPresenceData.cs

@@ -55,7 +55,7 @@ namespace OpenSim.Data.Null
         }
 
         public bool Store(PresenceData data)
-        {                      
+        {
             if (Instance != this)
                 return Instance.Store(data);
 
@@ -113,7 +113,7 @@ namespace OpenSim.Data.Null
         }
 
         public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {            
+        {
             if (Instance != this)
                 return Instance.SetHomeLocation(userID, regionID, position, lookAt);
 
@@ -130,28 +130,28 @@ namespace OpenSim.Data.Null
                     p.Data["HomePosition"] = position.ToString();
                     p.Data["HomeLookAt"] = lookAt.ToString();
                     foundone = true;
-                }                
+                }
             }
 
             return foundone;
         }
 
         public PresenceData[] Get(string field, string data)
-        {            
+        {
             if (Instance != this)
                 return Instance.Get(field, data);
 
 //            m_log.DebugFormat(
-//                "[NULL PRESENCE DATA]: Getting presence data for field {0} with parameter {1}", field, data);            
+//                "[NULL PRESENCE DATA]: Getting presence data for field {0} with parameter {1}", field, data);
 
             List<PresenceData> presences = new List<PresenceData>();
             if (field == "UserID")
             {
                 foreach (PresenceData p in m_presenceData.Values)
                 {
-                    if (p.UserID == data)                        
+                    if (p.UserID == data)
                     {
-                        presences.Add(p);                    
+                        presences.Add(p);
 //                        Console.WriteLine("HOME for " + p.UserID + " is " + (p.Data.ContainsKey("HomeRegionID") ? p.Data["HomeRegionID"] : "Not found"));
                     }
                 }
@@ -194,7 +194,7 @@ namespace OpenSim.Data.Null
         }
 
         public void Prune(string userID)
-        {                       
+        {
             if (Instance != this)
             {
                 Instance.Prune(userID);

OpenSim/Data/SQLite/SQLiteAuthenticationData.cs

@@ -120,7 +120,7 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool Store(AuthenticationData data)
-        {            
+        {
             if (data.Data.ContainsKey("UUID"))
                 data.Data.Remove("UUID");
 

OpenSim/Framework/IClientAPI.cs

@@ -881,6 +881,7 @@ namespace OpenSim.Framework
         event Action<IClientAPI> OnRegionHandShakeReply;
         event GenericCall2 OnRequestWearables;
         event GenericCall1 OnCompleteMovementToRegion;
+        event UpdateAgent OnPreAgentUpdate;
         event UpdateAgent OnAgentUpdate;
         event AgentRequestSit OnAgentRequestSit;
         event AgentSit OnAgentSit;

OpenSim/Framework/MultipartForm.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.Collections.Generic;
 using System.Net;
 using System.IO;

OpenSim/Framework/SLUtil.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.Collections.Generic;
 using System.Reflection;
 using log4net;
@@ -219,7 +246,7 @@ namespace OpenSim.Framework
         /// Parse a notecard in Linden format to a string of ordinary text.
         /// </summary>
         /// <param name="rawInput"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public static string ParseNotecardToString(string rawInput)
         {
             string[] output = ParseNotecardToList(rawInput).ToArray();
@@ -237,7 +264,7 @@ namespace OpenSim.Framework
         /// <returns></returns>
         public static List<string> ParseNotecardToList(string rawInput)
         {
-            string[] input = rawInput.Replace("\r", "").Split('\n');            
+            string[] input = rawInput.Replace("\r", "").Split('\n');
             int idx = 0;
             int level = 0;
             List<string> output = new List<string>();

OpenSim/Framework/UntrustedWebRequest.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.Collections.Generic;
 using System.IO;
 using System.Net;
@@ -118,7 +145,7 @@ namespace OpenSim.Framework
         /// <param name="allowLoopback">True to allow loopback addresses to be used</param>
         /// <param name="uri">The URI to test for whether it should be allowed.</param>
         /// <returns>
-        /// 	<c>true</c> if [is URI allowable] [the specified URI]; otherwise, <c>false</c>.
+        ///     <c>true</c> if [is URI allowable] [the specified URI]; otherwise, <c>false</c>.
         /// </returns>
         private static bool IsUriAllowable(Uri uri, bool allowLoopback)
         {
@@ -180,7 +207,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="ip">The ip address to check.</param>
         /// <returns>
-        /// 	<c>true</c> if this is a loopback IP address; <c>false</c> otherwise.
+        ///     <c>true</c> if this is a loopback IP address; <c>false</c> otherwise.
         /// </returns>
         private static bool IsIPv6Loopback(IPAddress ip)
         {

OpenSim/Framework/WebUtil.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.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;

OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs

@@ -127,6 +127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event ObjectDeselect OnObjectDetach;
         public event ObjectDrop OnObjectDrop;
         public event GenericCall1 OnCompleteMovementToRegion;
+        public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;
@@ -4893,7 +4894,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     UpdateAgent handlerAgentUpdate = OnAgentUpdate;
                     lastarg = arg; // save this set of arguments for nexttime
                     if (handlerAgentUpdate != null)
+                    {
+                        OnPreAgentUpdate(this, arg);
                         OnAgentUpdate(this, arg);
+                    }
 
                     handlerAgentUpdate = null;
                 }

OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

@@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments
-{        
+{
     public class AttachmentsModule : IAttachmentsModule, IRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -204,7 +204,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 if (m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
             }
-        }        
+        }
 
         public void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient)
         {
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
 
             DetachSingleAttachmentToInv(itemID, remoteClient);
-        }        
+        }
 
         // What makes this method odd and unique is it tries to detach using an UUID....     Yay for standards.
         // To LocalId or UUID, *THAT* is the question. How now Brown UUID??
@@ -252,6 +252,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     }
                 }
             }
-        }        
+        }
     }
 }

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

@@ -394,11 +394,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         public IClientAPI LocateClientObject(UUID agentID)
         {
             Scene scene = GetClientScene(agentID);
-            if(scene == null)
+            if (scene == null)
                 return null;
 
             ScenePresence presence = scene.GetScenePresence(agentID);
-            if(presence == null)
+            if (presence == null)
                 return null;
 
             return presence.ControllingClient;
@@ -481,7 +481,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 m_log.DebugFormat("[FRIENDS]: {0} offered friendship to {1}", principalID, friendID);
 
                 // This user wants to be friends with the other user.
-                // Let's add both relations to the DB, but one of them is inactive (-1)
+                // Let's add the relation backwards, in case the other is not online
                 FriendsService.StoreFriend(friendID, principalID.ToString(), 0);
 
                 // Now let's ask the other user to be friends with this user

OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs

@@ -108,7 +108,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             if (!m_Enabled)
                 return;
 
-            lock(m_Scenes)
+            lock (m_Scenes)
             {
                 m_Scenes.Remove(scene);
             }

OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs

@@ -576,7 +576,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     foreach (SceneObjectPart part in partList)
                     {
                         if (part.OwnerID != item.Owner)
-                        {                            
+                        {
                             part.LastOwnerID = part.OwnerID;
                             part.OwnerID = item.Owner;
                             part.Inventory.ChangeInventoryOwner(item.Owner);

OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs

@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
             m_LocalConnector = new LocalPresenceServicesConnector(config);
 
             // Let's stick in a test presence
-            m_LocalConnector.m_PresenceService.LoginAgent(UUID.Zero.ToString(), UUID.Zero, UUID.Zero);           
+            m_LocalConnector.m_PresenceService.LoginAgent(UUID.Zero.ToString(), UUID.Zero, UUID.Zero);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
                 p.Data = new Dictionary<string, string>();
                 p.Data["Online"] = true.ToString();
                 m_presenceData.Add(UUID.Zero, p);
-                */            
+                */
 
             string user1 = UUID.Zero.ToString();
             UUID session1 = UUID.Zero;

OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs

@@ -142,26 +142,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         public UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
-            UserAccount account = m_Cache.Get(userID);
+            bool inCache = false;
-            if (account != null)
+            UserAccount account = m_Cache.Get(userID, out inCache);
+            if (inCache)
                 return account;
 
             account = m_UserService.GetUserAccount(scopeID, userID);
-            if (account != null)
+            m_Cache.Cache(userID, account);
-                m_Cache.Cache(account);
 
             return account;
         }
 
         public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
         {
-            UserAccount account = m_Cache.Get(firstName + " " + lastName);
+            bool inCache = false;
-            if (account != null)
+            UserAccount account = m_Cache.Get(firstName + " " + lastName, out inCache);
+            if (inCache)
                 return account;
 
             account = m_UserService.GetUserAccount(scopeID, firstName, lastName);
             if (account != null)
-                m_Cache.Cache(account);
+                m_Cache.Cache(account.PrincipalID, account);
 
             return account;
         }

OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs

@@ -119,26 +119,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         public override UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
-            UserAccount account = m_Cache.Get(userID);
+            bool inCache = false;
-            if (account != null)
+            UserAccount account = m_Cache.Get(userID, out inCache);
+            if (inCache)
                 return account;
 
             account = base.GetUserAccount(scopeID, userID);
-            if (account != null)
+            m_Cache.Cache(userID, account);
-                m_Cache.Cache(account);
 
             return account;
         }
 
         public override UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
         {
-            UserAccount account = m_Cache.Get(firstName + " " + lastName);
+            bool inCache = false;
-            if (account != null)
+            UserAccount account = m_Cache.Get(firstName + " " + lastName, out inCache);
+            if (inCache)
                 return account;
 
             account = base.GetUserAccount(scopeID, firstName, lastName);
             if (account != null)
-                m_Cache.Cache(account);
+                m_Cache.Cache(account.PrincipalID, account);
 
             return account;
         }

OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs

@@ -36,50 +36,58 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
     public class UserAccountCache
     {
-        //private static readonly ILog m_log =
+        private static readonly ILog m_log =
-        //        LogManager.GetLogger(
+                LogManager.GetLogger(
-        //        MethodBase.GetCurrentMethod().DeclaringType);
+                MethodBase.GetCurrentMethod().DeclaringType);
-        
+        private ExpiringCache<UUID, UserAccount> m_UUIDCache;
-        private ICnmCache<UUID, UserAccount> m_UUIDCache;
+        private ExpiringCache<string, UUID> m_NameCache;
-        private Dictionary<string, UUID> m_NameCache;
 
         public UserAccountCache()
         {
             // Warning: the size values are a bit fuzzy. What matters
             // most for this cache is the count value (128 entries).
-            m_UUIDCache = CnmSynchronizedCache<UUID, UserAccount>.Synchronized(new CnmMemoryCache<UUID, UserAccount>(
+            m_UUIDCache = new ExpiringCache<UUID, UserAccount>();
-                        128, 128*512, TimeSpan.FromMinutes(30.0)));
+            m_NameCache = new ExpiringCache<string, UUID>(); // this one is unbound
-            m_NameCache = new Dictionary<string, UUID>(); // this one is unbound
         }
 
-        public void Cache(UserAccount account)
+        public void Cache(UUID userID, UserAccount account)
         {
-            m_UUIDCache.Set(account.PrincipalID, account, 512);
+            // Cache even null accounts
-            m_NameCache[account.Name] = account.PrincipalID;
+            m_UUIDCache.AddOrUpdate(userID, account, DateTime.Now + TimeSpan.FromMinutes(2.0d));
+            if (account != null)
+                m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, DateTime.Now + TimeSpan.FromMinutes(2.0d));
 
-            //m_log.DebugFormat("[USER CACHE]: cached user {0} {1}", account.FirstName, account.LastName);
+            m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
         }
 
-        public UserAccount Get(UUID userID)
+        public UserAccount Get(UUID userID, out bool inCache)
         {
             UserAccount account = null;
+            inCache = false;
             if (m_UUIDCache.TryGetValue(userID, out account))
             {
                 //m_log.DebugFormat("[USER CACHE]: Account {0} {1} found in cache", account.FirstName, account.LastName);
+                inCache = true;
                 return account;
             }
 
             return null;
         }
 
-        public UserAccount Get(string name)
+        public UserAccount Get(string name, out bool inCache)
         {
-            if (!m_NameCache.ContainsKey(name))
+            inCache = false;
+            if (!m_NameCache.Contains(name))
                 return null;
 
             UserAccount account = null;
-            if (m_UUIDCache.TryGetValue(m_NameCache[name], out account))
+            UUID uuid = UUID.Zero;
-                return account;
+            if (m_NameCache.TryGetValue(name, out uuid))
+                if (m_UUIDCache.TryGetValue(uuid, out account))
+                {
+                    inCache = true;
+                    return account;
+                }
 
             return null;
         }

OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs

@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Reflection;
 using log4net;
 using Nini.Config;
@@ -84,6 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         // caches ExtendedLandData
         private Cache parcelInfoCache;
+        private Vector3? forcedPosition = null;
 
         #region INonSharedRegionModule Members
 
@@ -136,6 +138,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
         }
 
+        private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason)
+        {
+            ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y);
+            reason = "You are not allowed to enter this sim.";
+            return nearestParcel != null;
+        }
+
         void EventManagerOnNewClient(IClientAPI client)
         {
             //Register some client events
@@ -153,6 +162,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             client.OnParcelInfoRequest += ClientOnParcelInfoRequest;
             client.OnParcelDwellRequest += ClientOnParcelDwellRequest;
             client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup;
+            client.OnPreAgentUpdate += ClientOnPreAgentUpdate;
 
             EntityBase presenceEntity;
             if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
@@ -162,6 +172,40 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
 
+        void ClientOnPreAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
+        {
+            //If we are forcing a position for them to go
+            if (forcedPosition != null)
+            {
+                ScenePresence clientAvatar = m_scene.GetScenePresence(remoteClient.AgentId);
+
+                //Putting the user into flying, both keeps the avatar in fligth when it bumps into something and stopped from going another direction AND
+                //When the avatar walks into a ban line on the ground, it prevents getting stuck
+                agentData.ControlFlags = (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
+
+
+                //Make sure we stop if they get about to the right place to prevent yoyo and prevents getting stuck on banlines
+                if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition.Value) < .2)
+                {
+                    Debug.WriteLine(string.Format("Stopping force position because {0} is close enough to position {1}", forcedPosition.Value, clientAvatar.AbsolutePosition));
+                    forcedPosition = null;
+                }
+                //if we are far away, teleport 
+                else if (Vector3.Distance(clientAvatar.AbsolutePosition,forcedPosition.Value) > 3)
+                {
+                    Debug.WriteLine(string.Format("Teleporting out because {0} is too far from avatar position {1}",forcedPosition.Value,clientAvatar.AbsolutePosition));
+                    clientAvatar.Teleport(forcedPosition.Value);
+                    forcedPosition = null;
+                }
+                else
+                {
+                    //Forces them toward the forced position we want if they aren't there yet
+                    agentData.UseClientAgentPosition = true;
+                    agentData.ClientAgentPosition = forcedPosition.Value;
+                }
+            }
+        }
+
 
         public void PostInitialise()
         {
@@ -267,9 +311,6 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 avatar.ControllingClient.SendAlertMessage(
                     "You are not allowed on this parcel because you are banned. Please go away.");
-
-                avatar.PhysicsActor.Position = avatar.lastKnownAllowedPosition;
-                avatar.PhysicsActor.Velocity = Vector3.Zero;
             }
             else
             {
@@ -278,6 +319,24 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
 
+        
+
+        private void ForceAvatarToPosition(ScenePresence avatar, Vector3? position)
+        {
+            if (m_scene.Permissions.IsGod(avatar.UUID)) return;
+            if (position.HasValue)
+            {
+                forcedPosition = position;
+            }
+        }
+
+        public void SendYouAreRestrictedNotice(ScenePresence avatar)
+        {
+            avatar.ControllingClient.SendAlertMessage(
+                "You are not allowed on this parcel because the land owner has restricted access.");
+            
+        }
+
         public void EventManagerOnAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID)
         {
             if (m_scene.RegionInfo.RegionID == regionID)
@@ -295,11 +354,12 @@ namespace OpenSim.Region.CoreModules.World.Land
                         if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID))
                         {
                             SendYouAreBannedNotice(avatar);
+                            ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar));
                         }
                         else if (parcelAvatarIsEntering.IsRestrictedFromLand(avatar.UUID))
                         {
-                            avatar.ControllingClient.SendAlertMessage(
+                            SendYouAreRestrictedNotice(avatar);
-                                "You are not allowed on this parcel because the land owner has restricted access. For now, you can enter, but please respect the land owner's decisions (or he can ban you!).");
+                            ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar));
                         }
                         else
                         {
@@ -400,7 +460,26 @@ namespace OpenSim.Region.CoreModules.World.Land
                     else if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT &&
                              parcel.IsBannedFromLand(clientAvatar.UUID))
                     {
-                        SendYouAreBannedNotice(clientAvatar);
+                        //once we've sent the message once, keep going toward the target until we are done
+                        if (forcedPosition == null)
+                        {
+                            SendYouAreBannedNotice(clientAvatar);
+                            ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar));
+                        }
+                    }
+                    else if (parcel.IsRestrictedFromLand(clientAvatar.UUID))
+                    {
+                        //once we've sent the message once, keep going toward the target until we are done
+                        if (forcedPosition == null)
+                        {
+                            SendYouAreRestrictedNotice(clientAvatar);
+                            ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar));
+                        }
+                    }
+                    else
+                    {
+                        //when we are finally in a safe place, lets release the forced position lock
+                        forcedPosition = null;
                     }
                 }
             }
@@ -412,7 +491,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
             if (over != null)
             {
-                if (!over.IsBannedFromLand(avatar.UUID) || avatar.AbsolutePosition.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT)
+                if (!over.IsRestrictedFromLand(avatar.UUID) && (!over.IsBannedFromLand(avatar.UUID) || avatar.AbsolutePosition.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT))
                 {
                     avatar.lastKnownAllowedPosition =
                         new Vector3(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);

OpenSim/Region/CoreModules/World/Land/LandObject.cs

@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <returns>Returns true if the piece of land contains the specified point</returns>
         public bool ContainsPoint(int x, int y)
         {
-            if (x >= 0 && y >= 0 && x <= Constants.RegionSize && x <= Constants.RegionSize)
+            if (x >= 0 && y >= 0 && x <= Constants.RegionSize && y <= Constants.RegionSize)
             {
                 return (LandBitmap[x / 4, y / 4] == true);
             }
@@ -286,7 +286,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                 entry.AgentID = avatar;
                 entry.Flags = AccessList.Ban;
                 entry.Time = new DateTime();
-                if (LandData.ParcelAccessList.Contains(entry))
+                //See if they are on the list, but make sure the owner isn't banned
+                if (LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)
                 {
                     //They are banned, so lets send them a notice about this parcel
                     return true;
@@ -303,7 +304,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                 entry.AgentID = avatar;
                 entry.Flags = AccessList.Access;
                 entry.Time = new DateTime();
-                if (!LandData.ParcelAccessList.Contains(entry))
+
+                //If they are not on the access list and are not the owner
+                if (!LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)
                 {
                     //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel
                     return true;

OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs

@@ -490,6 +490,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             if (m_allowGridGods)
             {
+                ScenePresence sp = m_scene.GetScenePresence(user);
+                if (sp != null)
+                {
+                    if (sp.UserLevel >= 200)
+                        return true;
+                    return false;
+                }
+
                 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, user);
                 if (account != null)
                 {
@@ -610,7 +618,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 return objectOwnerMask;
 
             // Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set
-            if (IsEstateManager(user) && m_RegionOwnerIsGod)
+            if (m_RegionOwnerIsGod && IsEstateManager(user) && !IsAdministrator(objectOwner))
                 return objectOwnerMask;
 
             // Admin should be able to edit anything in the sim (including admin objects)

OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs

@@ -84,6 +84,7 @@ namespace OpenSim.Region.Examples.SimpleModule
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall2 OnRequestWearables;
         public event GenericCall1 OnCompleteMovementToRegion;
+        public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;

OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs

@@ -31,7 +31,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
-{        
+{
     public interface IAttachmentsModule
     {
         /// <summary>
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="rot"></param>
         /// <param name="pos"></param>
         /// <param name="silent"></param>
-        /// <returns>true if the object was successfully attached, false otherwise</returns>        
+        /// <returns>true if the object was successfully attached, false otherwise</returns>
         bool AttachObject(
             IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent);
 
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="remoteClient"></param>
         /// <param name="itemID"></param>
         /// <param name="AttachmentPt"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         UUID SetAttachmentInventoryStatus(
             SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
 

OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.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.Collections.Generic;
 
 using OpenSim.Framework;

OpenSim/Region/Framework/Scenes/EventManager.cs

@@ -113,15 +113,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// Fired when an object is touched/grabbed.
         /// </summary>
         /// The originalID is the local ID of the part that was actually touched.  The localID itself is always that of
-        /// the root part.        
+        /// the root part.
         public event ObjectGrabDelegate OnObjectGrab;
-        public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs);        
+        public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs);
         
         public event ObjectGrabDelegate OnObjectGrabbing;
         public event ObjectDeGrabDelegate OnObjectDeGrab;
         public event ScriptResetDelegate OnScriptReset;
 
-        public event OnPermissionErrorDelegate OnPermissionError;        
+        public event OnPermissionErrorDelegate OnPermissionError;
 
         /// <summary>
         /// Fired when a new script is created.
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public delegate void ClientClosed(UUID clientID, Scene scene);
 
-        public event ClientClosed OnClientClosed;        
+        public event ClientClosed OnClientClosed;
 
         /// <summary>
         /// This is fired when a scene object property that a script might be interested in (such as color, scale or

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
@@ -1975,7 +1976,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
         {
             return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates);
-        }        
+        }
 
         /// <summary>
         /// Delete every object from the scene
@@ -2643,7 +2644,7 @@ namespace OpenSim.Region.Framework.Scenes
         public virtual void SubscribeToClientAttachmentEvents(IClientAPI client)
         {
             client.OnRezSingleAttachmentFromInv += RezSingleAttachment;
-            client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments;            
+            client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments;
             client.OnObjectAttach += m_sceneGraph.AttachObject;
             client.OnObjectDetach += m_sceneGraph.DetachObject;
 
@@ -2695,7 +2696,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         protected virtual void UnsubscribeToClientEvents(IClientAPI client)
-        {            
+        {
         }
 
         /// <summary>
@@ -2796,13 +2797,13 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public virtual void UnSubscribeToClientAttachmentEvents(IClientAPI client)
-        {            
+        {
             client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachments;
-            client.OnRezSingleAttachmentFromInv -= RezSingleAttachment;            
+            client.OnRezSingleAttachmentFromInv -= RezSingleAttachment;
             client.OnObjectAttach -= m_sceneGraph.AttachObject;
             client.OnObjectDetach -= m_sceneGraph.DetachObject;
 
-            if (AttachmentsModule != null)               
+            if (AttachmentsModule != null)
                 client.OnDetachAttachmentIntoInv -= AttachmentsModule.ShowDetachInUserInventory;
         }
 
@@ -3224,6 +3225,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// also return a reason.</returns>
         public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason)
         {
+            TeleportFlags tp = (TeleportFlags)teleportFlags;
             //Teleport flags:
             //
             // TeleportFlags.ViaGodlikeLure - Border Crossing
@@ -3257,6 +3259,17 @@ namespace OpenSim.Region.Framework.Scenes
 
             CapsModule.NewUserConnection(agent);
 
+            ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
+
+            //On login or border crossing test land permisions
+            if (tp != TeleportFlags.Default)
+            {
+                if (land != null && !TestLandRestrictions(agent, land, out reason))
+                {
+                    return false;
+                }
+            }
+
             ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
             if (sp != null)
             {
@@ -3329,7 +3342,6 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
                 // Honor parcel landing type and position.
-                ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
                 if (land != null)
                 {
                     if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero)
@@ -3345,6 +3357,40 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
+        private bool TestLandRestrictions(AgentCircuitData agent, ILandObject land,  out string reason)
+        {
+      
+            bool banned = land.IsBannedFromLand(agent.AgentID);
+            bool restricted = land.IsRestrictedFromLand(agent.AgentID);
+
+            if (banned || restricted)
+            {
+                ILandObject nearestParcel = GetNearestAllowedParcel(agent.AgentID, agent.startpos.X, agent.startpos.Y);
+                if (nearestParcel != null)
+                {
+                    //Move agent to nearest allowed
+                    Vector3 newPosition = GetParcelCenterAtGround(nearestParcel);
+                    agent.startpos.X = newPosition.X;
+                    agent.startpos.Y = newPosition.Y;
+                }
+                else
+                {
+                    if (banned)
+                    {
+                        reason = "Cannot regioncross into banned parcel.";
+                    }
+                    else
+                    {
+                        reason = String.Format("Denied access to private region {0}: You are not on the access list for that region.",
+                                   RegionInfo.RegionName);
+                    }
+                    return false;
+                }
+            }
+            reason = "";
+            return true;
+        }
+
         /// <summary>
         /// Verifies that the user has a presence on the Grid
         /// </summary>
@@ -3476,6 +3522,18 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
+        private ILandObject GetParcelAtPoint(float x, float y)
+        {
+            foreach (var parcel in AllParcels())
+            {
+                if (parcel.ContainsPoint((int)x,(int)y))
+                {
+                    return parcel;
+                }
+            }
+            return null;
+        }
+
         /// <summary>
         /// Update an AgentCircuitData object with new information
         /// </summary>
@@ -4748,5 +4806,175 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get { return m_allowScriptCrossings; }
         }
+
+        public Vector3? GetNearestAllowedPosition(ScenePresence avatar)
+        {
+            //simulate to make sure we have pretty up to date positions
+            PhysicsScene.Simulate(0);
+
+            ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+
+            if (nearestParcel != null)
+            {
+                Vector3 dir = Vector3.Normalize(Vector3.Multiply(avatar.Velocity, -1));
+                //Try to get a location that feels like where they came from
+                Vector3? nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
+                if (nearestPoint != null)
+                {
+                    Debug.WriteLine("Found a sane previous position based on velocity, sending them to: " + nearestPoint.ToString());
+                    return nearestPoint.Value;
+                }
+
+                //Sometimes velocity might be zero (local teleport), so try finding point along path from avatar to center of nearest parcel
+                Vector3 directionToParcelCenter = Vector3.Subtract(GetParcelCenterAtGround(nearestParcel), avatar.AbsolutePosition);
+                dir = Vector3.Normalize(directionToParcelCenter);
+                nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
+                if (nearestPoint != null)
+                {
+                    Debug.WriteLine("They had a zero velocity, sending them to: " + nearestPoint.ToString());
+                    return nearestPoint.Value;
+                }
+
+                //Ultimate backup if we have no idea where they are 
+                Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString());
+                return avatar.lastKnownAllowedPosition;
+
+            }
+
+            //Go to the edge, this happens in teleporting to a region with no available parcels
+            Vector3 nearestRegionEdgePoint = GetNearestRegionEdgePosition(avatar);
+            //Debug.WriteLine("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString());
+            return nearestRegionEdgePoint;
+            return null;
+        }
+
+        private Vector3 GetParcelCenterAtGround(ILandObject parcel)
+        {
+            Vector2 center = GetParcelCenter(parcel);
+            return GetPositionAtGround(center.X, center.Y);
+        }
+
+        private Vector3? GetNearestPointInParcelAlongDirectionFromPoint(Vector3 pos, Vector3 direction, ILandObject parcel)
+        {
+            Vector3 unitDirection = Vector3.Normalize(direction);
+            //Making distance to search go through some sane limit of distance
+            for (float distance = 0; distance < Constants.RegionSize * 2; distance += .5f)
+            {
+                Vector3 testPos = Vector3.Add(pos, Vector3.Multiply(unitDirection, distance));
+                if (parcel.ContainsPoint((int)testPos.X, (int)testPos.Y))
+                {
+                    return testPos;
+                }
+            }
+            return null;
+        }
+
+        public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y)
+        {
+            List<ILandObject> all = AllParcels();
+            float minParcelDistance = float.MaxValue;
+            ILandObject nearestParcel = null;
+
+            foreach (var parcel in all)
+            {
+                if (!parcel.IsEitherBannedOrRestricted(avatarId))
+                {
+                    float parcelDistance = GetParcelDistancefromPoint(parcel, x, y);
+                    if (parcelDistance < minParcelDistance)
+                    {
+                        minParcelDistance = parcelDistance;
+                        nearestParcel = parcel;
+                    }
+                }
+            }
+
+            return nearestParcel;
+        }
+
+        private List<ILandObject> AllParcels()
+        {
+            return LandChannel.AllParcels();
+        }
+
+        private float GetParcelDistancefromPoint(ILandObject parcel, float x, float y)
+        {
+            return Vector2.Distance(new Vector2(x, y), GetParcelCenter(parcel));
+        }
+
+        //calculate the average center point of a parcel
+        private Vector2 GetParcelCenter(ILandObject parcel)
+        {
+            int count = 0;
+            int avgx = 0;
+            int avgy = 0;
+            for (int x = 0; x < Constants.RegionSize; x++)
+            {
+                for (int y = 0; y < Constants.RegionSize; y++)
+                {
+                    //Just keep a running average as we check if all the points are inside or not
+                    if (parcel.ContainsPoint(x, y))
+                    {
+                        if (count == 0)
+                        {
+                            avgx = x;
+                            avgy = y;
+                        }
+                        else
+                        {
+                            avgx = (avgx * count + x) / (count + 1);
+                            avgy = (avgy * count + y) / (count + 1);
+                        }
+                        count += 1;
+                    }
+                }
+            }
+            return new Vector2(avgx, avgy);
+        }
+
+        private Vector3 GetNearestRegionEdgePosition(ScenePresence avatar)
+        {
+            float xdistance = avatar.AbsolutePosition.X < Constants.RegionSize / 2 ? avatar.AbsolutePosition.X : Constants.RegionSize - avatar.AbsolutePosition.X;
+            float ydistance = avatar.AbsolutePosition.Y < Constants.RegionSize / 2 ? avatar.AbsolutePosition.Y : Constants.RegionSize - avatar.AbsolutePosition.Y;
+
+            //find out what vertical edge to go to
+            if (xdistance < ydistance)
+            {
+                if (avatar.AbsolutePosition.X < Constants.RegionSize / 2)
+                {
+                    return GetPositionAtAvatarHeightOrGroundHeight(avatar, 0.0f, avatar.AbsolutePosition.Y);
+                }
+                else
+                {
+                    return GetPositionAtAvatarHeightOrGroundHeight(avatar, Constants.RegionSize, avatar.AbsolutePosition.Y);
+                }
+            }
+            //find out what horizontal edge to go to
+            else
+            {
+                if (avatar.AbsolutePosition.Y < Constants.RegionSize / 2)
+                {
+                    return GetPositionAtAvatarHeightOrGroundHeight(avatar, avatar.AbsolutePosition.X, 0.0f);
+                }
+                else
+                {
+                    return GetPositionAtAvatarHeightOrGroundHeight(avatar, avatar.AbsolutePosition.X, Constants.RegionSize);
+                }
+            }
+        }
+
+        private Vector3 GetPositionAtAvatarHeightOrGroundHeight(ScenePresence avatar, float x, float y)
+        {
+            Vector3 ground = GetPositionAtGround(x, y);
+            if (avatar.AbsolutePosition.Z > ground.Z)
+            {
+                ground.Z = avatar.AbsolutePosition.Z;
+            }
+            return ground;
+        }
+
+        private Vector3 GetPositionAtGround(float x, float y)
+        {
+            return new Vector3(x, y, GetGroundHeight(x, y));
+        }
     }
 }

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -569,7 +569,7 @@ namespace OpenSim.Region.Framework.Scenes
             ApplyPhysics(m_scene.m_physicalPrim);
 
             // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
-            // for the same object with very different properties.  The caller must schedule the update.            
+            // for the same object with very different properties.  The caller must schedule the update.
             //ScheduleGroupForFullUpdate();
         }
 
@@ -2032,11 +2032,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// Immediately send a full update for this scene object.
         /// </summary>
         public void SendGroupFullUpdate()
-        {                       
+        {
             if (IsDeleted)
                 return;
 
-//            m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);            
+//            m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
             
             RootPart.SendFullUpdateToAllClients();
 

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

@@ -2869,7 +2869,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 SendFullUpdateToClient(remoteClient, clientFlags);
             }
-        }        
+        }
 
         /// <summary>
         /// Send a full update for this part to all clients.

OpenSim/Region/Framework/Scenes/ScenePresence.cs

@@ -146,7 +146,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         private float m_sitAvatarHeight = 2.0f;
 
-        private float m_godlevel;
+        private int m_godLevel;
+        private int m_userLevel;
 
         private bool m_invulnerable = true;
 
@@ -294,9 +295,14 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_invulnerable; }
         }
 
-        public float GodLevel
+        public int UserLevel
         {
-            get { return m_godlevel; }
+            get { return m_userLevel; }
+        }
+
+        public int GodLevel
+        {
+            get { return m_godLevel; }
         }
 
         public ulong RegionHandle
@@ -668,6 +674,10 @@ namespace OpenSim.Region.Framework.Scenes
             m_regionInfo = reginfo;
             m_localId = m_scene.AllocateLocalId();
 
+            UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid);
+
+            m_userLevel = account.UserLevel;
+
             IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
             if (gm != null)
                 m_grouptitle = gm.GetGroupTitle(m_uuid);
@@ -2967,17 +2977,17 @@ namespace OpenSim.Region.Framework.Scenes
                 if (account != null)
                 {
                     if (account.UserLevel > 0)
-                        m_godlevel = account.UserLevel;
+                        m_godLevel = account.UserLevel;
                     else
-                        m_godlevel = 200;
+                        m_godLevel = 200;
                 }
             }
             else
             {
-                m_godlevel = 0;
+                m_godLevel = 0;
             }
 
-            ControllingClient.SendAdminResponse(token, (uint)m_godlevel);
+            ControllingClient.SendAdminResponse(token, (uint)m_godLevel);
         }
 
         #region Child Agent Updates
@@ -3068,7 +3078,7 @@ namespace OpenSim.Region.Framework.Scenes
             cAgent.ControlFlags = (uint)m_AgentControlFlags;
 
             if (m_scene.Permissions.IsGod(new UUID(cAgent.AgentID)))
-                cAgent.GodLevel = (byte)m_godlevel;
+                cAgent.GodLevel = (byte)m_godLevel;
             else 
                 cAgent.GodLevel = (byte) 0;
 
@@ -3157,7 +3167,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_AgentControlFlags = (AgentManager.ControlFlags)cAgent.ControlFlags; 
 
             if (m_scene.Permissions.IsGod(new UUID(cAgent.AgentID)))
-                m_godlevel = cAgent.GodLevel;
+                m_godLevel = cAgent.GodLevel;
             m_setAlwaysRun = cAgent.AlwaysRun;
 
             uint i = 0;

OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs

@@ -680,6 +680,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall2 OnRequestWearables;
         public event GenericCall1 OnCompleteMovementToRegion;
+        public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;

OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs

@@ -190,6 +190,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall2 OnRequestWearables;
         public event GenericCall1 OnCompleteMovementToRegion;
+        public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;

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

@@ -4024,7 +4024,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
             }
 
-            if( message == string.Empty)
+            if (message == string.Empty)
             {
                 ShoutError("Trying to use llTextBox with empty message.");
             }

OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.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.Collections;
 using System.Collections.Generic;
 using System.Net;

OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs

@@ -289,7 +289,7 @@ namespace OpenSim.Server.Handlers.Asset
                 foreach (InventoryItemBase i in icoll.Items)
                     items[i.ID.ToString()] = EncodeItem(i);
                 result["ITEMS"] = items;
-            }            
+            }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
             m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);

OpenSim/Services/Base/ServiceBase.cs

@@ -72,7 +72,7 @@ namespace OpenSim.Services.Base
 //                    m_log.DebugFormat("[SERVICE BASE]: Found type {0}", pluginType);
 
                     if (pluginType.IsPublic)
-                    {                        
+                    {
                         if (className != String.Empty &&
                                 pluginType.ToString() !=
                                 pluginType.Namespace + "." + className)

OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs

@@ -28,9 +28,9 @@
 using System;
 
 namespace OpenSim.Services.Connectors
-{     
+{
     public class GridUserServiceConnector
-    {       
+    {
         public GridUserServiceConnector()
         {
         }

OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.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.Collections;
 using System.Collections.Generic;
 using System.Drawing;

OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.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.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -334,7 +361,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             }
             catch (Exception e)
             {
-                m_log.Debug("[HGrid]: Exception " + e.Message);
+                m_log.Debug("[USER AGENT CONNECTOR]: Unable to contact remote server ");
                 reason = "Exception: " + e.Message;
                 return false;
             }

OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs

@@ -126,7 +126,7 @@ namespace OpenSim.Services.Connectors
                     });
 
             if (ret == null)
-                return null;            
+                return null;
             if (ret.Count == 0)
                 return null;
 

OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs

@@ -113,6 +113,7 @@ namespace OpenSim.Services.Connectors
 
         public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
+            m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUSerAccount {0}", userID);
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             //sendData["SCOPEID"] = scopeID.ToString();
             sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();

OpenSim/Services/HypergridService/UserAgentService.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.Collections.Generic;
 using System.Net;
 using System.Reflection;

OpenSim/Services/LLLoginService/LLLoginResponse.cs

@@ -623,7 +623,7 @@ namespace OpenSim.Services.LLLoginService
         }
 
         private InventoryData GetInventorySkeleton(List<InventoryFolderBase> folders)
-        {            
+        {
             UUID rootID = UUID.Zero;
             ArrayList AgentInventoryArray = new ArrayList();
             Hashtable TempHash;

OpenSim/Services/LLLoginService/LLLoginService.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.Collections.Generic;
 using System.Net;
 using System.Reflection;

OpenSim/Services/UserAccountService/GridUserService.cs

@@ -58,7 +58,7 @@ namespace OpenSim.Services.UserAccountService
             info.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
             info.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
 
-            return info;            
+            return info;
         }
         
         public bool StoreGridUserInfo(GridUserInfo info)

OpenSim/Services/UserAccountService/UserAccountService.cs

@@ -200,7 +200,9 @@ namespace OpenSim.Services.UserAccountService
             }
 
             if (d.Length < 1)
+            {
                 return null;
+            }
 
             return MakeUserAccount(d[0]);
         }

OpenSim/Tests/Common/Mock/TestClient.cs

@@ -96,6 +96,7 @@ namespace OpenSim.Tests.Common.Mock
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall2 OnRequestWearables;
         public event GenericCall1 OnCompleteMovementToRegion;
+        public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;