Formatting cleanup.

author: Jeff Ames 2008-05-16 01:22:11 +0000
committer: Jeff Ames 2008-05-16 01:22:11 +0000
commit: 65c5efe43b68700bad94076d4cd421160203c5de (patch)
tree: 589b56649ed02f4942671fd6e51c6dc43f682e0d /OpenSim/Region/Environment
parent: Thank you very much, mjm for : (diff)
download: opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.zip
opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.gz
opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.bz2
opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.xz
50 files changed, 1116 insertions, 1116 deletions
diff --git a/OpenSim/Region/Environment/InstantMessageReceiver.cs b/OpenSim/Region/Environment/InstantMessageReceiver.cs
index b82b4aa..d82bffc 100644
--- a/OpenSim/Region/Environment/InstantMessageReceiver.cs
+++ b/OpenSim/Region/Environment/InstantMessageReceiver.cs
@@ -32,11 +32,11 @@ namespace OpenSim.Region.Environment
    /// <summary>
    /// Bit Vector for Which Modules to send an instant message to from the Scene or an Associated Module
    /// </summary>
-    
    // This prevents the Modules from sending Instant messages to other modules through the scene
    // and then receiving the same messages
-    // This is mostly here because on LLSL and the SecondLife Client, IMs,Groups and friends are linked 
+    // This is mostly here because on LLSL and the SecondLife Client, IMs,Groups and friends are linked
    // inseparably
    [Flags]
diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
index 86958d1..d03e167 100644
--- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
+++ b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
@@ -31,7 +31,7 @@ using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Interfaces
 {
-    public interface IAvatarFactory 
+    public interface IAvatarFactory
    {
        bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance);
        void UpdateDatabase(LLUUID userID, AvatarAppearance avatAppearance);
diff --git a/OpenSim/Region/Environment/Interfaces/IScenePermissions.cs b/OpenSim/Region/Environment/Interfaces/IScenePermissions.cs
index f28b46c..eba4a04 100644
--- a/OpenSim/Region/Environment/Interfaces/IScenePermissions.cs
+++ b/OpenSim/Region/Environment/Interfaces/IScenePermissions.cs
@@ -28,7 +28,7 @@
 using libsecondlife;
 namespace OpenSim.Region.Environment.Interfaces
-{ 
+{
    public interface IScenePermissions
    {
    }
diff --git a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs b/OpenSim/Region/Environment/Interfaces/ITextureSender.cs
index 1b9e4eb..ece1953 100644
--- a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs
+++ b/OpenSim/Region/Environment/Interfaces/ITextureSender.cs
@@ -31,17 +31,17 @@ namespace OpenSim.Region.Environment.Interfaces
    /// Interface for an object which can send texture information to a client
    /// </summary>
    public interface ITextureSender
-    {        
+    {
        /// <summary>
        /// Are we in the process of sending the texture?
        /// </summary>
        bool Sending { get; set; }
-        
        /// <summary>
        /// Has the texture send been cancelled?
        /// </summary>
        bool Cancel { get; set; }
-        
        /// <summary>
        /// Update the non data properties of a texture request
        /// </summary>
@@ -53,6 +53,6 @@ namespace OpenSim.Region.Environment.Interfaces
        /// Send a texture packet to the client.
        /// </summary>
        /// <returns>True if the last packet has been sent, false otherwise.</returns>
-        bool SendTexturePacket();     
+        bool SendTexturePacket();
    }
 }
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
index 48db51b..d3cf41e 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
@@ -216,7 +216,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
            public IClientAPI RequestUser;
            public LLUUID TransferRequestID;
            //public bool AssetInCache;
-            //public int TimeRequested; 
+            //public int TimeRequested;
            public AssetRequest()
            {
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index bae23fa..65785af 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
    /// </summary>
    public class AgentAssetTransactions
    {
-        //private static readonly log4net.ILog m_log 
+        //private static readonly log4net.ILog m_log
        //   = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
        // Fields
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
                    }
                    ourClient.SendConfirmXfer(xferID, packetID);
-                    
                    if ((packetID & 0x80000000) != 0)
                    {
                        SendCompleteMessage();
@@ -209,7 +209,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
            /// <param name="xferID"></param>
            /// <param name="packetID"></param>
            /// <param name="data"></param>
-            /// <returns>True if the transfer is complete, false otherwise</returns>            
+            /// <returns>True if the transfer is complete, false otherwise</returns>
            public bool Initialise(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data,
                                   bool storeLocal, bool tempFile)
            {
@@ -363,7 +363,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
            private void DoCreateItem()
            {
-                //really need to fix this call, if lbsa71 saw this he would die. 
+                //really need to fix this call, if lbsa71 saw this he would die.
                m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(Asset);
                CachedUserInfo userInfo =
                    m_userTransactions.Manager.MyScene.CommsManager.UserProfileCacheService.GetUserDetails(ourClient.AgentId);
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
index fcd0e0c..fd407d9 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
        /// <summary>
        /// Create an inventory item from data that has been received through a transaction.
-        /// 
+        ///
        /// This is called when new clothing or body parts are created.  It may also be called in other
        /// situations.
        /// </summary>
@@ -229,8 +229,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
        /// <summary>
        /// Update an inventory item with data that has been received through a transaction.
-        /// 
+        ///
-        /// This is called when clothing or body parts are updated (for instance, with new textures or 
+        /// This is called when clothing or body parts are updated (for instance, with new textures or
        /// colours).  It may also be called in other situations.
        /// </summary>
        /// <param name="remoteClient"></param>
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
index 474ac75..8f81f3d 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
 {
    public class TextureDownloadModule : IRegionModule
    {
-        //private static readonly log4net.ILog m_log 
+        //private static readonly log4net.ILog m_log
        //    = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
        /// <summary>
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
        private void TextureSent(ITextureSender sender)
        {
            sender.Sending = false;
-            //m_log.DebugFormat("[TEXTURE DOWNLOAD]: Removing download stat for {0}", sender.assetID);            
+            //m_log.DebugFormat("[TEXTURE DOWNLOAD]: Removing download stat for {0}", sender.assetID);
            m_scene.AddPendingDownloads(-1);
        }
    }
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
index 70e44d4..7c187c0 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
    /// </summary>
    public class TextureNotFoundSender : ITextureSender
    {
-        //private static readonly log4net.ILog m_log 
+        //private static readonly log4net.ILog m_log
        //    = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
        private bool m_cancel = false;
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
        public bool SendTexturePacket()
        {
            //m_log.InfoFormat(
-            //    "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", 
+            //    "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found",
            //    m_textureId);
            ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
index d4fa39f..42624ad 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
 {
    /// <summary>
    /// This module sets up texture senders in response to client texture requests, and places them on a
-    /// processing queue once those senders have the appropriate data (i.e. a texture retrieved from the 
+    /// processing queue once those senders have the appropriate data (i.e. a texture retrieved from the
    /// asset cache).
    /// </summary>
    public class UserTextureDownloadService
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
        /// <summary>
        /// We will allow the client to request the same texture n times before dropping further requests
-        /// 
+        ///
        /// This number includes repeated requests for the same texture at different resolutions (which we don't
        /// currently handle properly as far as I know).  However, this situation should be handled in a more
        /// sophisticated way.
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
        /// We're going to limit requests for the same missing texture.
        /// XXX This is really a temporary solution to deal with the situation where a client continually requests
        /// the same missing textures
-        /// </summary>        
+        /// </summary>
        private readonly IRequestLimitStrategy<LLUUID> missingTextureLimitStrategy
            = new RepeatLimitStrategy<LLUUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
        }
        /// <summary>
-        /// Handle a texture request.  This involves creating a texture sender and placing it on the 
+        /// Handle a texture request.  This involves creating a texture sender and placing it on the
        /// previously passed in shared queue.
        /// </summary>
        /// <param name="e"></param>
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
                {
                    if (m_textureSenders.TryGetValue(e.RequestedAssetID, out textureSender))
                    {
-                        // If we've received new non UUID information for this request and it hasn't dispatched 
+                        // If we've received new non UUID information for this request and it hasn't dispatched
                        // yet, then update the request accordingly.
                        textureSender.UpdateRequest(e.DiscardLevel, e.PacketNumber);
                    }
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
                        if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID))
                        {
 //                            m_log.DebugFormat(
-//                                "[USER TEXTURE DOWNLOAD SERVICE]: Refusing request for {0} from client {1}", 
+//                                "[USER TEXTURE DOWNLOAD SERVICE]: Refusing request for {0} from client {1}",
 //                                e.RequestedAssetID, m_client.AgentId);
                            return;
@@ -128,9 +128,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
                            {
                                if (StatsManager.SimExtraStats != null)
                                    StatsManager.SimExtraStats.AddBlockedMissingTextureRequest();
-                                
-                                // Commenting out this message for now as it causes too much noise with other 
+                                // Commenting out this message for now as it causes too much noise with other
-                                // debug messages.  
+                                // debug messages.
 //                                m_log.DebugFormat(
 //                                    "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests",
 //                                    e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS);
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index ea84436..be73156 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.Environment.Interfaces;
 namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
 {
    /// <summary>
-    /// A TextureSender handles the process of receiving a texture requested by the client from the 
+    /// A TextureSender handles the process of receiving a texture requested by the client from the
    /// AssetCache, and then sending that texture back to the client.
    /// </summary>
    public class TextureSender : ITextureSender
@@ -150,14 +150,14 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
                {
                    if (NumPackets == 0)
                    {
-                        
                        RequestUser.SendImagePart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
-                        
                        PacketCounter++;
                    }
                    else
                    {
-                        
                        byte[] ImageData1 = new byte[600];
                        Array.Copy(m_asset.Data, 0, ImageData1, 0, 600);
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
                }
                else
                {
-                    // Doesn't like to be refactored...    
+                    // Doesn't like to be refactored...
                    ImagePacketPacket im = new ImagePacketPacket();
                    im.Header.Reliable = false;
                    im.ImageID.Packet = (ushort)(PacketCounter);
diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
index 1b50bbd..16874d7 100644
--- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="remoteClient"></param>
        /// <param name="xferID"></param>
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
index 9e5f376..a72010c 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
@@ -235,7 +235,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
                                                   {
                                                       TrySendChatMessage(presence, fromPos, regionPos,
                                                                          fromAgentID, fromName, e.Type, message, ChatSourceType.Agent);
-                                                       
                                                   }
                                               });
                }
@@ -572,7 +572,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
            string regex = @":(?<nick>\w*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)";
            Regex RE = new Regex(regex, RegexOptions.Multiline);
            MatchCollection matches = RE.Matches(input);
-            // Get some direct matches $1 $4 is a 
+            // Get some direct matches $1 $4 is a
            if ((matches.Count == 1) && (matches[0].Groups.Count == 5))
            {
                result = new Dictionary<string, string>();
@@ -703,7 +703,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
        public void ProcessIRCCommand(string command)
        {
-            //m_log.Info("[IRC]: ProcessIRCCommand:" + command); 
+            //m_log.Info("[IRC]: ProcessIRCCommand:" + command);
            string[] commArgs = new string[command.Split(' ').Length];
            string c_server = m_server;
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index c63fc93..fab546b 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -46,10 +46,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
    /// Demo Economy/Money Module.  This is not a production quality money/economy module!
    /// This is a demo for you to use when making one that works for you.
    ///  // To use the following you need to add:
-    /// -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> 
+    /// -helperuri <ADDRESS TO HERE OR grid MONEY SERVER>
    /// to the command line parameters you use to start up your client
    /// This commonly looks like -helperuri http://127.0.0.1:9000/
-    /// 
+    ///
    /// Centralized grid structure example using OpenSimWi Redux revision 9+
    /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux
    /// </summary>
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
                        XMLRPCHandler = scene;
                        // To use the following you need to add:
-                        // -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> 
+                        // -helperuri <ADDRESS TO HERE OR grid MONEY SERVER>
                        // to the command line parameters you use to start up your client
                        // This commonly looks like -helperuri http://127.0.0.1:9000/
@@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
        private void OnNewClient(IClientAPI client)
        {
            // Here we check if we're in grid mode
-            // I imagine that the 'check balance' 
+            // I imagine that the 'check balance'
            // function for the client should be here or shortly after
            if (gridmode)
@@ -367,7 +367,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
            {
                lock (m_KnownClientFunds)
                {
-                    // If we don't know about the sender, then the sender can't 
+                    // If we don't know about the sender, then the sender can't
                    // actually be here and therefore this is likely fraud or outdated.
                    if (m_MoneyAddress.Length == 0)
                    {
@@ -1394,7 +1394,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
                        m_rootAgents[avatar.UUID] = avatar.Scene.RegionInfo.originRegionID;
-                        
                        //m_log.Info("[MONEY]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + ".");
                        // Claim User! my user!  Mine mine mine!
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 8c96392..c82f88d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -97,9 +97,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
        private void OnNewClient(IClientAPI client)
        {
            // All friends establishment protocol goes over instant message
-            // There's no way to send a message from the sim 
+            // There's no way to send a message from the sim
            // to a user to 'add a friend' without causing dialog box spam
-            // 
+            //
            // The base set of friends are added when the user signs on in their XMLRPC response
            // Generated by LoginService.  The friends are retreived from the database by the UserManager
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
                                LLUUID[] Agents = new LLUUID[1];
                                Agents[0] = client.AgentId;
                                av.ControllingClient.SendAgentOnline(Agents);
-                               
                            }
                        }
                    }
@@ -223,14 +223,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
                    }
                    catch (IndexOutOfRangeException)
                    {
-                        // Ignore the index out of range exception.  
+                        // Ignore the index out of range exception.
                        // This causes friend lists to get out of sync slightly..  however
                        // prevents a sim crash.
                        m_log.Info("[FRIEND]: Unable to enumerate last friendlist user.  User logged off");
                    }
                    catch (ArgumentOutOfRangeException)
                    {
-                        // Ignore the index out of range exception.  
+                        // Ignore the index out of range exception.
                        // This causes friend lists to get out of sync slightly..  however
                        // prevents a sim crash.
                        m_log.Info("[FRIEND]: Unable to enumerate last friendlist user.  User logged off");
@@ -248,14 +248,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
                        catch (IndexOutOfRangeException)
                        {
-                            // Ignore the index out of range exception.  
+                            // Ignore the index out of range exception.
                            // This causes friend lists to get out of sync slightly..  however
                            // prevents a sim crash.
                            m_log.Info("[FRIEND]: Unable to enumerate last friendlist user.  User logged off");
                        }
                        catch (ArgumentOutOfRangeException)
                        {
-                            // Ignore the index out of range exception.  
+                            // Ignore the index out of range exception.
                            // This causes friend lists to get out of sync slightly..  however
                            // prevents a sim crash.
                            m_log.Info("[FRIEND]: Unable to enumerate last friendlist user.  User logged off");
@@ -411,10 +411,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
        {
            if (m_pendingFriendRequests.ContainsKey(transactionID))
            {
-                // Found Pending Friend Request with that Transaction..    
+                // Found Pending Friend Request with that Transaction..
                Scene SceneAgentIn = m_scene[0];
-                // Found Pending Friend Request with that Transaction..    
+                // Found Pending Friend Request with that Transaction..
                ScenePresence agentpresence = GetPresenceFromAgentID(agentID);
                if (agentpresence != null)
                {
@@ -453,7 +453,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
            {
                Scene SceneAgentIn = m_scene[0];
-                // Found Pending Friend Request with that Transaction..    
+                // Found Pending Friend Request with that Transaction..
                ScenePresence agentpresence = GetPresenceFromAgentID(agentID);
                if (agentpresence != null)
                {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs
index 624f307..e1cc688 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory
                        // First byte of the array is probably the item type
                        // Next 16 bytes are the UUID
-                        //Array.Copy(binaryBucket, 1, rawId, 0, 16); 
+                        //Array.Copy(binaryBucket, 1, rawId, 0, 16);
                        //LLUUID itemId = new LLUUID(new Guid(rawId));
                        LLUUID itemId = new LLUUID(binaryBucket, 1);
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
index 15825b6..2e2be7a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="remoteClient"></param>
        /// <param name="avatarID"></param>
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
index 2112f91..f8651a3 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice
        public string ProvisionVoiceAccountRequest(string request, string path, string param,
                                                   LLUUID agentID, Caps caps)
        {
-            // we need to 
+            // we need to
            // - get user data from UserProfileCacheService
            // - generate nonce for user voice account password
            // - issue XmlRpc request to asterisk opensim front end:
diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index e1339a3..87ecfee 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -40,25 +40,25 @@ using OpenSim.Region.Environment.Scenes;
 /*****************************************************
 *
 * ScriptsHttpRequests
- * 
+ *
 * Implements the llHttpRequest and http_response
 * callback.
- * 
+ *
 * Some stuff was already in LSLLongCmdHandler, and then
 * there was this file with a stub class in it.  So,
 * I am moving some of the objects and functions out of
 * LSLLongCmdHandler, such as the HttpRequestClass, the
- * start and stop methods, and setting up pending and 
+ * start and stop methods, and setting up pending and
- * completed queues.  These are processed in the 
+ * completed queues.  These are processed in the
- * LSLLongCmdHandler polling loop.  Similiar to the 
+ * LSLLongCmdHandler polling loop.  Similiar to the
 * XMLRPCModule, since that seems to work.
- * 
+ *
 * //TODO
- * 
+ *
 * This probably needs some throttling mechanism but
 * its wide open right now.  This applies to both
 * number of requests and data volume.
- * 
+ *
 * Linden puts all kinds of header fields in the requests.
 * Not doing any of that:
 * User-Agent
@@ -71,13 +71,13 @@ using OpenSim.Region.Environment.Scenes;
 * X-SecondLife-Local-Rotation
 * X-SecondLife-Owner-Name
 * X-SecondLife-Owner-Key
- * 
+ *
 * HTTPS support
- * 
+ *
 * Configurable timeout?
 * Configurable max repsonse size?
 * Configurable
- * 
+ *
 * **************************************************/
 namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
diff --git a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
index 626c60f..bbd4fa3 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.VectorRender
            foreach (string line in lines)
            {
                string nextLine = line.Trim();
-                //replace with switch, or even better, do some proper parsing 
+                //replace with switch, or even better, do some proper parsing
                if (nextLine.StartsWith("MoveTo"))
                {
                    float x = 0;
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
index 7a15708..4ed0fb5 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
@@ -37,25 +37,25 @@ using OpenSim.Region.Environment.Scenes;
 /*****************************************************
 *
 * WorldCommModule
- * 
+ *
- * 
+ *
 * Holding place for world comms - basically llListen
 * function implementation.
- * 
+ *
 * lLListen(integer channel, string name, key id, string msg)
- * The name, id, and msg arguments specify the filtering 
+ * The name, id, and msg arguments specify the filtering
- * criteria. You can pass the empty string 
+ * criteria. You can pass the empty string
- * (or NULL_KEY for id) for these to set a completely 
+ * (or NULL_KEY for id) for these to set a completely
- * open filter; this causes the listen() event handler to be 
+ * open filter; this causes the listen() event handler to be
- * invoked for all chat on the channel. To listen only 
+ * invoked for all chat on the channel. To listen only
- * for chat spoken by a specific object or avatar, 
+ * for chat spoken by a specific object or avatar,
- * specify the name and/or id arguments. To listen 
+ * specify the name and/or id arguments. To listen
- * only for a specific command, specify the 
+ * only for a specific command, specify the
- * (case-sensitive) msg argument. If msg is not empty, 
+ * (case-sensitive) msg argument. If msg is not empty,
- * listener will only hear strings which are exactly equal 
+ * listener will only hear strings which are exactly equal
 * to msg. You can also use all the arguments to establish
 * the most restrictive filtering criteria.
- * 
+ *
 * It might be useful for each listener to maintain a message
 * digest, with a list of recent messages by UUID.  This can
 * be used to prevent in-world repeater loops.  However, the
@@ -76,7 +76,7 @@ using OpenSim.Region.Environment.Scenes;
 *    Might be actually easier to map the global handle into
 *    script-local handle in the ScriptEngine. Not sure if its
 *    worth the effort tho.
- * 
+ *
 * **************************************************/
 namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
@@ -317,9 +317,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
        }
        /********************************************************************
-         * 
+         *
         * Listener Stuff
-         * 
+         *
         * *****************************************************************/
        private void DeliverClientMessage(Object sender, ChatFromViewerArgs e)
diff --git a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
index a039d42..9d4e0fa 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -43,12 +43,12 @@ using OpenSim.Region.Environment.Scenes;
 /*****************************************************
 *
 * XMLRPCModule
- * 
+ *
 * Module for accepting incoming communications from
 * external XMLRPC client and calling a remote data
 * procedure for a registered data channel/prim.
- * 
+ *
- * 
+ *
 * 1. On module load, open a listener port
 * 2. Attach an XMLRPC handler
 * 3. When a request is received:
@@ -59,18 +59,18 @@ using OpenSim.Region.Environment.Scenes;
 * 3.5 Return response to client caller
 * 3.6 If no response from llRemoteDataReply within
 *     RemoteReplyScriptTimeout, generate script timeout fault
- * 
+ *
 * Prims in script must:
 * 1. Open a remote data channel
 * 1.1 Generate a channel ID
 * 1.2 Register primid,channelid pair with module
 * 2. Implement the remote data procedure handler
- * 
+ *
 * llOpenRemoteDataChannel
 * llRemoteDataReply
 * remote_data(integer type, key channel, key messageid, string sender, integer ival, string sval)
 * llCloseRemoteDataChannel
- * 
+ *
 * **************************************************/
 namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
@@ -157,16 +157,16 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
        /**********************************************
         * OpenXMLRPCChannel
-         * 
+         *
         * Generate a LLUUID channel key and add it and
         * the prim id to dictionary <channelUUID, primUUID>
-         * 
+         *
         * First check if there is a channel assigned for
         * this itemID.  If there is, then someone called
         * llOpenRemoteDataChannel twice.  Just return the
         * original channel.  Other option is to delete the
         * current channel and assign a new one.
-         * 
+         *
         * ********************************************/
        public LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID)
@@ -224,9 +224,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
        /**********************************************
         * Remote Data Reply
-         * 
+         *
         * Response to RPC message
-         * 
+         *
         *********************************************/
        public void RemoteDataReply(string channel, string message_id, string sdata, int idata)
@@ -245,9 +245,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
        /**********************************************
         * CloseXMLRPCChannel
-         * 
+         *
         * Remove channel from dictionary
-         * 
+         *
         *********************************************/
        public void CloseXMLRPCChannel(LLUUID channelKey)
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
index b5d5e6e..82341a9 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
        #region Constants
        //Land types set with flags in ParcelOverlay.
-        //Only one of these can be used. 
+        //Only one of these can be used.
        public const float BAN_LINE_SAFETY_HIEGHT = 100;
        public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = 128; //Equals 10000000
        public const byte LAND_FLAG_PROPERTY_BORDER_WEST = 64; //Equals 01000000
@@ -584,7 +584,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
                        if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)
                        {
                            remote_client.sendLandParcelOverlay(byteArray, sequenceID);
-                            byteArrayCount = 0;                           
+                            byteArrayCount = 0;
                            sequenceID++;
                            byteArray = new byte[LAND_BLOCKS_PER_PACKET];
                        }
@@ -655,7 +655,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
        public void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client)
        {
-            
            landList[local_id].sendForceObjectSelect(local_id, request_type, remote_client);
        }
@@ -870,7 +870,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
        }
        public void handleAnyClientMovement(ScenePresence avatar)
-            //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance. 
+            //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance.
        {
            ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
            if (over != null)
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index b319370..54870d8 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -622,7 +622,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
        /// <summary>
        /// Notify the parcel owner each avatar that owns prims situated on their land.  This notification includes
        /// aggreagete details such as the number of prims.
-        ///  
+        ///
        /// </summary>
        /// <param name="remote_client">
        /// A <see cref="IClientAPI"/>
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index d31a250..43e8f36 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
        #region Constants
        // These are here for testing.  They will be taken out
-        
        //private uint PERM_ALL = (uint)2147483647;
        private uint PERM_COPY = (uint)32768;
        //private uint PERM_MODIFY = (uint)16384;
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
        #region Bypass Permissions / Debug Permissions Stuff
-        // Bypasses the permissions engine 
+        // Bypasses the permissions engine
        private bool m_bypassPermissions = false;
        private bool m_bypassPermissionsValue = true;
        private bool m_debugPermissions = false;
@@ -126,18 +126,18 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
        public void Initialise(Scene scene, IConfigSource config)
        {
            m_scene = scene;
-            
            IConfig myConfig = config.Configs["Startup"];
-            
-                        string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule");
-                        List<string> modules=new List<string>(permissionModules.Split(','));
+            string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule");
+            List<string> modules=new List<string>(permissionModules.Split(','));
-                        if(!modules.Contains("DefaultPermissionsModule"))
+            if (!modules.Contains("DefaultPermissionsModule"))
-                                return;
+                return;
+            m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
-            m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);            
-            
            m_scene.RegisterModuleInterface<IScenePermissions>(this);
            //Register functions with Scene External Checks!
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
            get { return false; }
        }
-        #endregion        
+        #endregion
        #region Helper Functions
        protected void SendPermissionError(LLUUID user, string reason)
@@ -252,38 +252,38 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
        }
 #endregion
-                public bool PropagatePermissions()
+        public bool PropagatePermissions()
-                {
+        {
-                        return false;
+            return false;
-                }
+        }
-                public bool BypassPermissions()
+        public bool BypassPermissions()
-                {
+        {
-                        return m_bypassPermissions;
+            return m_bypassPermissions;
-                }
+        }
-                public void SetBypassPermissions(bool value)
+        public void SetBypassPermissions(bool value)
-                {
+        {
-                        m_bypassPermissions=value;
+            m_bypassPermissions=value;
-                }
+        }
        #region Object Permissions
        public uint GenerateClientFlags(LLUUID user, LLUUID objID)
        {
-            // Here's the way this works, 
+            // Here's the way this works,
            // ObjectFlags and Permission flags are two different enumerations
            // ObjectFlags, however, tells the client to change what it will allow the user to do.
-            // So, that means that all of the permissions type ObjectFlags are /temporary/ and only 
+            // So, that means that all of the permissions type ObjectFlags are /temporary/ and only
-            // supposed to be set when customizing the objectflags for the client.  
+            // supposed to be set when customizing the objectflags for the client.
-            // These temporary objectflags get computed and added in this function based on the 
+            // These temporary objectflags get computed and added in this function based on the
            // Permission mask that's appropriate!
            // Outside of this method, they should never be added to objectflags!
            // -teravus
            SceneObjectPart task=m_scene.GetSceneObjectPart(objID);
-            
            // this shouldn't ever happen..     return no permissions/objectflags.
            if (task == null)
                return (uint)0;
@@ -292,7 +292,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
            LLUUID objectOwner = task.OwnerID;
-            // Remove any of the objectFlags that are temporary.  These will get added back if appropriate 
+            // Remove any of the objectFlags that are temporary.  These will get added back if appropriate
            // in the next bit of code
            objflags &= (uint)
@@ -354,7 +354,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
        private uint ApplyObjectModifyMasks(uint setPermissionMask, uint objectFlagsMask)
        {
-            // We are adding the temporary objectflags to the object's objectflags based on the 
+            // We are adding the temporary objectflags to the object's objectflags based on the
            // permission flag given.  These change the F flags on the client.
            if ((setPermissionMask & (uint)PermissionMask.Copy) != 0)
@@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
            locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0);
            // People shouldn't be able to do anything with locked objects, except the Administrator
-            // The 'set permissions' runs through a different permission check, so when an object owner 
+            // The 'set permissions' runs through a different permission check, so when an object owner
            // sets an object locked, the only thing that they can do is unlock it.
            //
            // Nobody but the object owner can set permissions on an object
@@ -458,7 +458,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
            bool permission = false;
            string reason = "Only registered users may communicate with another account.";
-            
            if (IsAdministrator(user))
                permission = true;
@@ -521,7 +521,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
            return GenericParcelPermission(user, parcel);
        }
 #endregion
-        
        #region Permission Checks
            private bool CanAbandonParcel(LLUUID user, ILandObject parcel, Scene scene)
            {
@@ -607,7 +607,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
            {
                DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
                if (m_bypassPermissions) return m_bypassPermissionsValue;
-                
                return GenericCommunicationPermission(user, target);
            }
@@ -632,8 +632,8 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                        return false;
                    }
-                    // The client 
+                    // The client
-                    // may request to edit linked parts, and therefore, it needs 
+                    // may request to edit linked parts, and therefore, it needs
                    // to also check for SceneObjectPart
                    // If it's not an object, we cant edit it.
@@ -647,7 +647,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                    LLUUID taskOwner = null;
-                    // Added this because at this point in time it wouldn't be wise for 
+                    // Added this because at this point in time it wouldn't be wise for
                    // the administrator object permissions to take effect.
                    LLUUID objectOwner = task.OwnerID;
@@ -682,12 +682,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                    // This is an exception to the generic object permission.
-                    // Administrators who lock their objects should not be able to move them, 
+                    // Administrators who lock their objects should not be able to move them,
                    // however generic object permission should return true.
                    // This keeps locked objects from being affected by random click + drag actions by accident
                    // and allows the administrator to grab or delete a locked object.
-                    // Administrators and estate managers are still able to click+grab locked objects not 
+                    // Administrators and estate managers are still able to click+grab locked objects not
                    // owned by them in the scene
                    // This is by design.
@@ -834,7 +834,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                    SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
                    LLUUID taskOwner = null;
-                    // Added this because at this point in time it wouldn't be wise for 
+                    // Added this because at this point in time it wouldn't be wise for
                    // the administrator object permissions to take effect.
                    LLUUID objectOwner = task.OwnerID;
@@ -895,61 +895,61 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
        #endregion
-                        public bool CanLinkObject(LLUUID userID, LLUUID objectID)
+            public bool CanLinkObject(LLUUID userID, LLUUID objectID)
-                        {
+            {
                DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
                if (m_bypassPermissions) return m_bypassPermissionsValue;
-                                return true;
+                return true;
-                        }
+            }
-                        public bool CanDelinkObject(LLUUID userID, LLUUID objectID)
+            public bool CanDelinkObject(LLUUID userID, LLUUID objectID)
-                        {
+            {
                DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
                if (m_bypassPermissions) return m_bypassPermissionsValue;
-                                return true;
+                return true;
-                        }
+            }
-                        public bool CanBuyLand(LLUUID userID, ILandObject parcel, Scene scene)
+            public bool CanBuyLand(LLUUID userID, ILandObject parcel, Scene scene)
-                        {
+            {
                DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
                if (m_bypassPermissions) return m_bypassPermissionsValue;
-                                return true;
+                return true;
-                        }
+            }
-                        public bool CanCopyInventory(LLUUID itemID, LLUUID objectID, LLUUID userID)
+            public bool CanCopyInventory(LLUUID itemID, LLUUID objectID, LLUUID userID)
-                        {
+            {
                DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
                if (m_bypassPermissions) return m_bypassPermissionsValue;
-                                return true;
+                return true;
-                        }
+            }
-                        public bool CanDeleteInventory(LLUUID itemID, LLUUID objectID, LLUUID userID)
+            public bool CanDeleteInventory(LLUUID itemID, LLUUID objectID, LLUUID userID)
-                        {
+            {
                DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
                if (m_bypassPermissions) return m_bypassPermissionsValue;
-                                return true;
+                return true;
-                        }
+            }
-                        public bool CanCreateInventory(uint invType, LLUUID objectID, LLUUID userID)
+            public bool CanCreateInventory(uint invType, LLUUID objectID, LLUUID userID)
-                        {
+            {
                DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
                if (m_bypassPermissions) return m_bypassPermissionsValue;
-                                return true;
+                return true;
-                        }
+            }
-                        public bool CanTeleport(LLUUID userID)
+            public bool CanTeleport(LLUUID userID)
-                        {
+            {
                DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
                if (m_bypassPermissions) return m_bypassPermissionsValue;
-                                return true;
+                return true;
-                        }
+            }
    }
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index beb74ce..1bdc702 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules
        // Current time in elpased seconds since Jan 1st 1970
        private ulong CurrentTime
        {
-            get { 
+            get {
                return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset)/10000000);
            }
        }
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment.Modules
            TimeZone local = TimeZone.CurrentTimeZone;
            TicksOffset = local.GetUtcOffset(local.ToLocalTime(DateTime.Now)).Ticks;
-            
            m_log.Debug("[SUN] localtime offset is " + TicksOffset);
            // Align ticks with Second Life
@@ -246,7 +246,7 @@ namespace OpenSim.Region.Environment.Modules
                avatar.ControllingClient.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition);
            }
-            // set estate settings for region access to sun position 
+            // set estate settings for region access to sun position
            m_scene.RegionInfo.EstateSettings.sunPosition = Position;
        }
@@ -281,7 +281,7 @@ namespace OpenSim.Region.Environment.Modules
            Position   = LLVector3.Rot(Position,Tilt);
-            // Finally we shift the axis so that more of the 
+            // Finally we shift the axis so that more of the
            // circle is above the horizon than below. This
            // makes the nights shorter than the days.
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
index eb981d9..98d69a5 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
@@ -31,9 +31,9 @@ using OpenSim.Region.Environment.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
    /// <summary>
-    /// A generic windows bitmap loader. 
+    /// A generic windows bitmap loader.
    /// Should be capable of handling 24-bit RGB images.
-    /// 
+    ///
    /// Uses the System.Drawing filesystem loader.
    /// </summary>
    internal class BMP : GenericSystemDrawing
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 484bb89..bb819e1 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -33,7 +33,7 @@ using OpenSim.Region.Environment.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
    /// <summary>
-    /// A virtual class designed to have methods overloaded, 
+    /// A virtual class designed to have methods overloaded,
    /// this class provides an interface for a generic image
    /// saving and loading mechanism, but does not specify the
    /// format. It should not be insubstantiated directly.
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
        }
        /// <summary>
-        /// Protected method, generates a grayscale bitmap 
+        /// Protected method, generates a grayscale bitmap
        /// image from a specified terrain channel.
        /// </summary>
        /// <param name="map">The terrain channel to export to bitmap</param>
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
        }
        /// <summary>
-        /// Protected method, generates a coloured bitmap 
+        /// Protected method, generates a coloured bitmap
        /// image from a specified terrain channel.
        /// </summary>
        /// <param name="map">The terrain channel to export to bitmap</param>
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
index 0c4e3de..7bf88f0 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -43,14 +43,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
            double sum = 0.0;
            double step2 = 0.0;
-            // compute delta map 
+            // compute delta map
            for (x = 0; x < map.Width; x++)
            {
                for (y = 0; y < map.Height; y++)
                {
                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount
                    {
                        sum += map[x, y] * z;
                        step2 += z;
@@ -60,14 +60,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
            double avg = sum / step2;
-            // blend in map 
+            // blend in map
            for (x = 0; x < map.Width; x++)
            {
                for (y = 0; y < map.Height; y++)
                {
                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * duration;
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount
                    {
                        if (z > 1.0)
                            z = 1.0;
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
index f2a1800..6df8408 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
@@ -32,8 +32,8 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 {
    /// <summary>
    /// Speed-Optimised Hybrid Erosion Brush
-    /// 
+    ///
-    /// As per Jacob Olsen's Paper 
+    /// As per Jacob Olsen's Paper
    /// http://www.oddlabs.com/download/terrain_generation.pdf
    /// </summary>
    public class OlsenSphere : ITerrainPaintableEffect
@@ -164,7 +164,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
                {
                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount
                    {
                        const int NEIGHBOUR_ME = 4;
                        const int NEIGHBOUR_MAX = 9;
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 49946fd..fc0a579 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -43,14 +43,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
            double area = strength;
            double step = strength / 4.0;
-            // compute delta map 
+            // compute delta map
            for (x = 0; x < map.Width; x++)
            {
                for (y = 0; y < map.Height; y++)
                {
                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount
                    {
                        double average = 0.0;
                        int avgsteps = 0;
@@ -69,14 +69,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
                    }
                }
            }
-            // blend in map 
+            // blend in map
            for (x = 0; x < map.Width; x++)
            {
                for (y = 0; y < map.Height; y++)
                {
                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount
                    {
                        double da = z;
                        double a = (map[x, y] - tweak[x, y]) * da;
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
index 753d171..b3aa732 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
@@ -160,7 +160,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
                {
                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount
                    {
                        const int NEIGHBOUR_ME = 4;
                        const int NEIGHBOUR_MAX = 9;
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 18a2851..4b6ca49 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Environment.Scenes
 {
    [Serializable]
    public abstract class EntityBase : ISerializable
-    {   
+    {
        /// <summary>
        /// The scene to which this entity belongs
        /// </summary>
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Environment.Scenes
        protected string m_name;
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public virtual string Name
        {
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Environment.Scenes
        protected LLVector3 m_pos;
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public virtual LLVector3 AbsolutePosition
        {
@@ -79,7 +79,7 @@ namespace OpenSim.Region.Environment.Scenes
        protected LLVector3 m_rotationalvelocity;
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public virtual LLVector3 Velocity
        {
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public abstract void UpdateMovement();
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index aa22740..352fdf9 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Environment.Scenes
            set
            {
                // If we're not doing the initial set
-                // Then we've got to remove the previous 
+                // Then we've got to remove the previous
                // event handler
                try
                {
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Scenes
                    // This occurs when storing to _PhyScene the first time.
                    // Is there a better way to check the event handler before
                    // getting here
-                    // This can be safely ignored.  We're setting the first inital 
+                    // This can be safely ignored.  We're setting the first inital
                    // there are no event handler's registered.
                }
@@ -120,7 +120,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                ScenePresences.Clear();
            }
-            
            //SceneObjects.Clear();
            Entities.Clear();
        }
@@ -235,7 +235,7 @@ namespace OpenSim.Region.Environment.Scenes
                for (int i = 0; i < m_updateList.Count; i++)
                {
                    EntityBase entity = m_updateList[i];
-                    
                    // Don't abort the whole update if one entity happens to give us an exception.
                    try
                    {
@@ -327,7 +327,7 @@ namespace OpenSim.Region.Environment.Scenes
                    part.Undo();
            }
-                
        }
@@ -341,7 +341,7 @@ namespace OpenSim.Region.Environment.Scenes
        public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, LLQuaternion rot)
        {
            // Calls attach with a Zero position
-            
            AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, LLVector3.Zero);
        }
        public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,uint ItemFlags, uint NextOwnerMask)
@@ -364,8 +364,8 @@ namespace OpenSim.Region.Environment.Scenes
        // To LocalId or LLUUID, *THAT* is the question. How now Brown LLUUID??
        public void DetachSingleAttachmentToInv(LLUUID itemID, IClientAPI remoteClient)
        {
-            
-            if (itemID == LLUUID.Zero) // If this happened, someone made a mistake....  
+            if (itemID == LLUUID.Zero) // If this happened, someone made a mistake....
                return;
            List<EntityBase> EntityList = GetEntities();
@@ -443,14 +443,14 @@ namespace OpenSim.Region.Environment.Scenes
                        {
                            remoteClient.SendAgentAlertMessage("You don't have sufficient permissions to attach this object", false);
                        }
-                        
                    }
                }
            }
        }
-       
        public ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child, AvatarAppearance appearance)
        {
            ScenePresence newAvatar = null;
@@ -627,13 +627,13 @@ namespace OpenSim.Region.Environment.Scenes
            return result;
        }
-        
        /// <summary>
        /// Get the controlling client for the given avatar, if there is one.
-        /// 
+        ///
-        /// FIXME: The only user of the method right now is Caps.cs, in order to resolve a client API since it can't 
+        /// FIXME: The only user of the method right now is Caps.cs, in order to resolve a client API since it can't
        /// use the ScenePresence.  This could be better solved in a number of ways - we could establish an
-        /// OpenSim.Framework.IScenePresence, or move the caps code into a region package (which might be the more 
+        /// OpenSim.Framework.IScenePresence, or move the caps code into a region package (which might be the more
        /// suitable solution).
        /// </summary>
        /// <param name="agentId"></param>
@@ -641,12 +641,12 @@ namespace OpenSim.Region.Environment.Scenes
        public IClientAPI GetControllingClient(LLUUID agentId)
        {
            ScenePresence presence = GetScenePresence(agentId);
-            
            if (presence != null)
            {
                return presence.ControllingClient;
            }
-            
            return null;
        }
@@ -657,7 +657,7 @@ namespace OpenSim.Region.Environment.Scenes
        public List<ScenePresence> GetScenePresences(FilterAvatarList filter)
        {
            // No locking of scene presences here since we're passing back a list...
-            
            List<ScenePresence> result = new List<ScenePresence>();
            List<ScenePresence> ScenePresencesList = GetScenePresences();
@@ -681,7 +681,7 @@ namespace OpenSim.Region.Environment.Scenes
        {
            ScenePresence sp;
            ScenePresences.TryGetValue(agentID, out sp);
-            
            return sp;
        }
@@ -764,13 +764,13 @@ namespace OpenSim.Region.Environment.Scenes
            {
                if (!presence.IsChildAgent)
                {
-                    avatar = presence;                   
+                    avatar = presence;
                    return true;
                }
                else
                {
                    m_log.WarnFormat(
-                        "[INNER SCENE]: Requested avatar {0} could not be found in scene {1} since it is only registered as a child agent!", 
+                        "[INNER SCENE]: Requested avatar {0} could not be found in scene {1} since it is only registered as a child agent!",
                        avatarId, m_parentScene.RegionInfo.RegionName);
                }
            }
@@ -846,8 +846,8 @@ namespace OpenSim.Region.Environment.Scenes
                {
                    // Only send child agents stuff in their draw distance.
                    // This will need to be done for every agent once we figure out
-                    // what we're going to use to store prim that agents already got 
+                    // what we're going to use to store prim that agents already got
-                    // the initial update for and what we'll use to limit the 
+                    // the initial update for and what we'll use to limit the
                    // space we check for new objects on movement.
                    if (presence.IsChildAgent && m_parentScene.m_seeIntoRegionFromNeighbor)
@@ -889,7 +889,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Client Event handlers
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <param name="scale"></param>
@@ -918,7 +918,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// This handles the nifty little tool tip that you get when you drag your mouse over an object 
+        /// This handles the nifty little tool tip that you get when you drag your mouse over an object
        /// Send to the Object Group to process.  We don't know enough to service the request
        /// </summary>
        /// <param name="remoteClient"></param>
@@ -936,7 +936,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <param name="rot"></param>
@@ -954,7 +954,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <param name="rot"></param>
@@ -972,7 +972,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <param name="pos"></param>
@@ -1009,7 +1009,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <param name="pos"></param>
@@ -1019,13 +1019,13 @@ namespace OpenSim.Region.Environment.Scenes
            SceneObjectGroup group = GetGroupByPrim(localID);
            if (group != null)
            {
-                
                LLVector3 oldPos = group.AbsolutePosition;
                if (group.RootPart.m_IsAttachment)
                {
                    group.UpdateGroupPosition(pos);
                }
-                else 
+                else
                {
                    if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment)
                    {
@@ -1041,7 +1041,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <param name="texture"></param>
@@ -1059,7 +1059,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <param name="packet"></param>
@@ -1094,7 +1094,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="primLocalID"></param>
        /// <param name="description"></param>
@@ -1111,7 +1111,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="primLocalID"></param>
        /// <param name="description"></param>
@@ -1141,7 +1141,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="primLocalID"></param>
        /// <param name="shapeBlock"></param>
@@ -1223,7 +1223,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                parenPrim.LinkToGroup(sceneObj);
            }
-            
            // We need to explicitly resend the newly link prim's object properties since no other actions
            // occur on link to invoke this elsewhere (such as object selection)
            parenPrim.GetProperties(client);
@@ -1232,7 +1232,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// Delink a linkset
        /// </summary>
-        /// <param name="prims"></param>    
+        /// <param name="prims"></param>
        public void DelinkObjects(List<uint> primIds)
        {
            SceneObjectGroup parenPrim = null;
@@ -1278,7 +1278,7 @@ namespace OpenSim.Region.Environment.Scenes
            else
            {
                // If the first scan failed, we need to do a /deep/ scan of the linkages.  This is /really/ slow
-                // We know that this is not the root prim now essentially, so we don't have to worry about remapping 
+                // We know that this is not the root prim now essentially, so we don't have to worry about remapping
                // which one is the root prim
                bool delinkedSomething = false;
                for (int i = 0; i < primIds.Count; i++)
@@ -1324,7 +1324,7 @@ namespace OpenSim.Region.Environment.Scenes
                    }
                }
            }
-            
            //Protip: In my day, we didn't call them searchable objects, we called them limited point-to-point joints
            //aka ObjectFlags.JointWheel = IncludeInSearch
@@ -1356,7 +1356,7 @@ namespace OpenSim.Region.Environment.Scenes
        public void DuplicateObject(uint originalPrim, LLVector3 offset, uint flags, LLUUID AgentID, LLUUID GroupID)
        {
            m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID);
-            
            List<EntityBase> EntityList = GetEntities();
            SceneObjectGroup originPrim = null;
@@ -1405,7 +1405,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <returns></returns>
        public float Vector3Distance(Vector3 v1, Vector3 v2)
        {
-            // We don't really need the double floating point precision...   
+            // We don't really need the double floating point precision...
            // so casting it to a single
            return
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 6aef45e..5e2ccec 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Scenes
 {
    public partial class Scene
    {
-        private static readonly ILog m_log 
+        private static readonly ILog m_log
            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        /// <summary>
@@ -49,14 +49,14 @@ namespace OpenSim.Region.Environment.Scenes
        public void StartScripts()
        {
            m_log.Info("[PRIM INVENTORY]: Starting scripts in scene");
-            
            foreach (EntityBase group in Entities.Values)
            {
                if (group is SceneObjectGroup)
                {
                    ((SceneObjectGroup) group).StartScripts();
                }
-            }            
+            }
        }
        /// <summary>
@@ -67,9 +67,9 @@ namespace OpenSim.Region.Environment.Scenes
        /// in which the item is to be placed.</param>
        public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item)
        {
-            CachedUserInfo userInfo 
+            CachedUserInfo userInfo
                = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
-            
            if (userInfo != null)
            {
                userInfo.AddItem(item);
@@ -91,17 +91,17 @@ namespace OpenSim.Region.Environment.Scenes
                m_log.ErrorFormat(
                    "[AGENT INVENTORY]: Agent {0} {1} was not found for add of item {2} {3}",
                    remoteClient.Name, remoteClient.AgentId, item.Name, item.ID);
-                
                return;
-            }             
+            }
        }
-        /// <summary> 
+        /// <summary>
        /// <see>AddInventoryItem(LLUUID, InventoryItemBase)</see>
        /// </summary>
        /// <param name="avatarId">The ID of the avatar</param>
        /// <param name="item">The item.  This structure contains all the item metadata, including the folder
-        /// in which the item is to be placed.</param>        
+        /// in which the item is to be placed.</param>
        public void AddInventoryItem(LLUUID avatarId, InventoryItemBase item)
        {
            ScenePresence avatar;
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Scenes
                if (userInfo.RootFolder != null)
                {
                    InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
-                    
                    if (item != null)
                    {
                        AssetBase asset =
@@ -188,13 +188,13 @@ namespace OpenSim.Region.Environment.Scenes
        /// <param name="itemID"></param>
        /// <param name="primID">The prim which contains the item to update</param>
        /// <param name="isScriptRunning">Indicates whether the script to update is currently running</param>
-        /// <param name="data"></param>       
+        /// <param name="data"></param>
        public void CapsUpdateTaskInventoryScriptAsset(IClientAPI remoteClient, LLUUID itemId,
                                                       LLUUID primId, bool isScriptRunning, byte[] data)
        {
            // Retrieve group
            SceneObjectPart part = GetSceneObjectPart(primId);
-            SceneObjectGroup group = part.ParentGroup;            
+            SceneObjectGroup group = part.ParentGroup;
            if (null == group)
            {
                m_log.ErrorFormat(
@@ -204,36 +204,36 @@ namespace OpenSim.Region.Environment.Scenes
                return;
            }
-                        
            // Retrieve item
            TaskInventoryItem item = group.GetInventoryItem(part.LocalId, itemId);
            if (null == item)
            {
                return;
            }
-            
            // Create new asset
-            // XXX Hardcoding the numbers is a temporary measure - need an enumeration for this 
+            // XXX Hardcoding the numbers is a temporary measure - need an enumeration for this
            // There may well be one in libsecondlife
            AssetBase asset = CreateAsset(item.Name, item.Description, 10, 10, data);
            AssetCache.AddAsset(asset);
-                        
            // Update item with new asset
            item.AssetID = asset.FullID;
            group.UpdateInventoryItem(item);
            group.GetProperties(remoteClient);
-            
-            // Trigger rerunning of script (use TriggerRezScript event, see RezScript)           
+            // Trigger rerunning of script (use TriggerRezScript event, see RezScript)
            if (isScriptRunning)
            {
                group.StopScript(part.LocalId, item.ItemID);
-                group.StartScript(part.LocalId, item.ItemID);            
+                group.StartScript(part.LocalId, item.ItemID);
            }
        }
        /// <summary>
        /// <see>CapsUpdateTaskInventoryScriptAsset(IClientAPI, LLUUID, LLUUID, bool, byte[])</see>
-        /// </summary>      
+        /// </summary>
        private void CapsUpdateTaskInventoryScriptAsset(LLUUID avatarId, LLUUID itemId,
                                                        LLUUID primId, bool isScriptRunning, byte[] data)
        {
@@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Scenes
            if (userInfo != null && userInfo.RootFolder != null)
            {
                InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
-                
                if (item != null)
                {
                    if (LLUUID.Zero == transactionID)
@@ -284,7 +284,7 @@ namespace OpenSim.Region.Environment.Scenes
                        item.Name = itemUpd.Name;
                        item.Description = itemUpd.Description;
                        item.NextPermissions = itemUpd.NextPermissions;
-                                                item.CurrentPermissions |= 8; // Slam!
+                        item.CurrentPermissions |= 8; // Slam!
                        item.EveryOnePermissions = itemUpd.EveryOnePermissions;
                        // TODO: Requires sanity checks
@@ -323,7 +323,7 @@ namespace OpenSim.Region.Environment.Scenes
                    "[AGENT INVENTORY]: Agent ID " + remoteClient.AgentId + " not found for an inventory item update.");
            }
        }
-        
        /// <summary>
        /// Give an inventory item from one avatar to another
        /// </summary>
@@ -333,35 +333,35 @@ namespace OpenSim.Region.Environment.Scenes
        public void GiveInventoryItem(IClientAPI recipientClient, LLUUID senderId, LLUUID itemId)
        {
            // Retrieve the item from the sender
-            CachedUserInfo senderUserInfo = CommsManager.UserProfileCacheService.GetUserDetails(senderId);            
+            CachedUserInfo senderUserInfo = CommsManager.UserProfileCacheService.GetUserDetails(senderId);
-            
            if (senderUserInfo == null)
            {
                m_log.ErrorFormat(
                     "[AGENT INVENTORY]: Failed to find sending user {0} for item {1}", senderId, itemId);
-                
                return;
            }
            if (senderUserInfo.RootFolder != null)
            {
                InventoryItemBase item = senderUserInfo.RootFolder.FindItem(itemId);
-                
                if (item != null)
                {
-                                        if (!ExternalChecks.ExternalChecksBypassPermissions())
+                    if (!ExternalChecks.ExternalChecksBypassPermissions())
-                                        {
+                    {
-                                                if((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
+                        if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
-                                                        return;
+                            return;
-                                        }
+                    }
                    // TODO get recipient's root folder
-                    CachedUserInfo recipientUserInfo 
+                    CachedUserInfo recipientUserInfo
-                        = CommsManager.UserProfileCacheService.GetUserDetails(recipientClient.AgentId);                    
+                        = CommsManager.UserProfileCacheService.GetUserDetails(recipientClient.AgentId);
-                    
                    if (recipientUserInfo != null)
                    {
-                        // Insert a copy of the item into the recipient                    
+                        // Insert a copy of the item into the recipient
                        InventoryItemBase itemCopy = new InventoryItemBase();
                        itemCopy.Owner = recipientClient.AgentId;
                        itemCopy.Creator = senderId;
@@ -372,37 +372,37 @@ namespace OpenSim.Region.Environment.Scenes
                        itemCopy.AssetType = item.AssetType;
                        itemCopy.InvType = item.InvType;
                        itemCopy.Folder = recipientUserInfo.RootFolder.ID;
-                                                if (ExternalChecks.ExternalChecksPropagatePermissions())
+                        if (ExternalChecks.ExternalChecksPropagatePermissions())
-                                                {
+                        {
-                                                        if(item.InvType == 6)
+                            if (item.InvType == 6)
-                                                        {
+                            {
-                                                                itemCopy.BasePermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
+                                itemCopy.BasePermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
-                                                                itemCopy.BasePermissions |= (item.CurrentPermissions & 7) << 13;
+                                itemCopy.BasePermissions |= (item.CurrentPermissions & 7) << 13;
-                                                        }
+                            }
-                                                        else
+                            else
-                                                        {
+                            {
-                                                        Console.WriteLine("Non-Prim item ==>");
+                            Console.WriteLine("Non-Prim item ==>");
-                                                                itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions;
+                                itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions;
-                                                        }
+                            }
-                                                        itemCopy.CurrentPermissions = itemCopy.BasePermissions;
+                            itemCopy.CurrentPermissions = itemCopy.BasePermissions;
-                                                        if((item.CurrentPermissions & 8) != 0) // Propagate slam bit
+                            if ((item.CurrentPermissions & 8) != 0) // Propagate slam bit
-                                                        {
+                            {
-                                                                itemCopy.CurrentPermissions = item.NextPermissions;
+                                itemCopy.CurrentPermissions = item.NextPermissions;
-                                                                itemCopy.BasePermissions=itemCopy.CurrentPermissions;
+                                itemCopy.BasePermissions=itemCopy.CurrentPermissions;
-                                                                itemCopy.CurrentPermissions |= 8;
+                                itemCopy.CurrentPermissions |= 8;
-                                                        }
+                            }
-                                                        itemCopy.NextPermissions = item.NextPermissions;
+                            itemCopy.NextPermissions = item.NextPermissions;
-                                                        itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions;
+                            itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions;
-                                                }
+                        }
-                                                else
+                        else
-                                                {
+                        {
-                                                        itemCopy.CurrentPermissions = item.CurrentPermissions;
+                            itemCopy.CurrentPermissions = item.CurrentPermissions;
-                                                        itemCopy.NextPermissions = item.NextPermissions;
+                            itemCopy.NextPermissions = item.NextPermissions;
-                                                        itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions;
+                            itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions;
-                                                        itemCopy.BasePermissions = item.BasePermissions;
+                            itemCopy.BasePermissions = item.BasePermissions;
-                                                }
+                        }
                        itemCopy.GroupID = item.GroupID;
                        itemCopy.GroupOwned = item.GroupOwned;
                        itemCopy.Flags = item.Flags;
@@ -410,21 +410,21 @@ namespace OpenSim.Region.Environment.Scenes
                        itemCopy.SaleType = item.SaleType;
                        recipientUserInfo.AddItem(itemCopy);
-                        
-                                                if (!ExternalChecks.ExternalChecksBypassPermissions())
+                        if (!ExternalChecks.ExternalChecksBypassPermissions())
-                                                {
+                        {
-                                                        if((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+                            if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
-                                                                senderUserInfo.DeleteItem(itemId);
+                                senderUserInfo.DeleteItem(itemId);
-                                                }
+                        }
                        // Let the recipient client know about this new item
-                        recipientClient.SendBulkUpdateInventory(itemCopy);                         
+                        recipientClient.SendBulkUpdateInventory(itemCopy);
                    }
                    else
                    {
                        m_log.ErrorFormat(
-                            "[AGENT INVENTORY]: Could not find userinfo for recipient user {0}, {1} of item {2}, {3} from {4}", 
+                            "[AGENT INVENTORY]: Could not find userinfo for recipient user {0}, {1} of item {2}, {3} from {4}",
-                            recipientClient.Name, recipientClient.AgentId, item.Name, 
+                            recipientClient.Name, recipientClient.AgentId, item.Name,
                            item.ID, senderId);
                    }
                }
@@ -432,7 +432,7 @@ namespace OpenSim.Region.Environment.Scenes
                {
                    m_log.ErrorFormat(
                        "[AGENT INVENTORY]: Failed to find item {0} to give to {1}", itemId, senderId);
-                    
                    return;
                }
            }
@@ -440,7 +440,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemId.ToString() + ", no root folder");
                return;
-            }                       
+            }
        }
        public void CopyInventoryItem(IClientAPI remoteClient, uint callbackID, LLUUID oldAgentID, LLUUID oldItemID,
@@ -449,9 +449,9 @@ namespace OpenSim.Region.Environment.Scenes
            m_log.DebugFormat(
                "[AGENT INVENTORY]: CopyInventoryItem received by {0} with oldAgentID {1}, oldItemID {2}, new FolderID {3}, newName {4}",
                remoteClient.AgentId, oldAgentID, oldItemID, newFolderID, newName);
-            
            InventoryItemBase item = CommsManager.UserProfileCacheService.libraryRoot.FindItem(oldItemID);
-            
            if (item == null)
            {
                CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(oldAgentID);
@@ -464,7 +464,7 @@ namespace OpenSim.Region.Environment.Scenes
                if (userInfo.RootFolder != null)
                {
                    item = userInfo.RootFolder.FindItem(oldItemID);
-                    
                    if (item == null)
                    {
                        m_log.Error("[AGENT INVENTORY]: Failed to find item " + oldItemID.ToString());
@@ -477,29 +477,29 @@ namespace OpenSim.Region.Environment.Scenes
                    return;
                }
            }
-            
-            AssetBase asset 
+            AssetBase asset
                = AssetCache.GetAsset(
                    item.AssetID, (item.AssetType == (int)AssetType.Texture ? true : false));
            if (asset != null)
            {
-                                if(remoteClient.AgentId == oldAgentID)
+                if (remoteClient.AgentId == oldAgentID)
-                                {
+                {
-                                        CreateNewInventoryItem(
+                    CreateNewInventoryItem(
-                                                remoteClient, newFolderID, callbackID, asset, item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, item.NextPermissions);
+                        remoteClient, newFolderID, callbackID, asset, item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, item.NextPermissions);
-                                }
+                }
-                                else
+                else
-                                {
+                {
-                                        CreateNewInventoryItem(
+                    CreateNewInventoryItem(
-                                                remoteClient, newFolderID, callbackID, asset, item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, item.NextPermissions);
+                        remoteClient, newFolderID, callbackID, asset, item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, item.NextPermissions);
-                                }
+                }
            }
            else
            {
                m_log.ErrorFormat(
                    "[AGENT INVENTORY]: Could not copy item {0} since asset {1} could not be found",
-                    item.Name, item.AssetID);                
+                    item.Name, item.AssetID);
            }
        }
@@ -530,18 +530,18 @@ namespace OpenSim.Region.Environment.Scenes
                "[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId);
            CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
-            
            if (userInfo == null)
            {
                m_log.Error("[AGENT INVENTORY]: Failed to find user " + remoteClient.AgentId.ToString());
-                
                return;
            }
            if (userInfo.RootFolder != null)
            {
                InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
-                
                if (item != null)
                {
                    if (newName != String.Empty)
@@ -549,7 +549,7 @@ namespace OpenSim.Region.Environment.Scenes
                        item.Name = newName;
                    }
                    item.Folder = folderID;
-                    
                    userInfo.DeleteItem(item.ID);
                    AddInventoryItem(remoteClient, item);
@@ -557,23 +557,23 @@ namespace OpenSim.Region.Environment.Scenes
                else
                {
                    m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemID.ToString());
-                    
                    return;
                }
            }
            else
            {
                m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemID.ToString() + ", no root folder");
-                
                return;
            }
        }
        private void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID folderID, uint callbackID,
                                            AssetBase asset, uint nextOwnerMask)
-                {
+        {
-                        CreateNewInventoryItem(remoteClient, folderID, callbackID, asset, nextOwnerMask, nextOwnerMask, 0, nextOwnerMask);
+            CreateNewInventoryItem(remoteClient, folderID, callbackID, asset, nextOwnerMask, nextOwnerMask, 0, nextOwnerMask);
-                }
+        }
        /// <summary>
        /// Create a new inventory item.
@@ -586,9 +586,9 @@ namespace OpenSim.Region.Environment.Scenes
        private void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID folderID, uint callbackID,
                                            AssetBase asset, uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask)
        {
-            CachedUserInfo userInfo 
+            CachedUserInfo userInfo
                = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
-            
            if (userInfo != null)
            {
                InventoryItemBase item = new InventoryItemBase();
@@ -603,8 +603,8 @@ namespace OpenSim.Region.Environment.Scenes
                item.Folder = folderID;
                item.CurrentPermissions = currentMask;
                item.NextPermissions = nextOwnerMask;
-                                item.EveryOnePermissions = everyoneMask;
+                item.EveryOnePermissions = everyoneMask;
-                                item.BasePermissions = baseMask;
+                item.BasePermissions = baseMask;
                userInfo.AddItem(item);
                remoteClient.SendInventoryItemCreateUpdate(item);
@@ -612,7 +612,7 @@ namespace OpenSim.Region.Environment.Scenes
            else
            {
                m_log.WarnFormat(
-                    "No user details associated with client {0} uuid {1} in CreateNewInventoryItem!", 
+                    "No user details associated with client {0} uuid {1} in CreateNewInventoryItem!",
                     remoteClient.Name, remoteClient.AgentId);
            }
        }
@@ -637,12 +637,12 @@ namespace OpenSim.Region.Environment.Scenes
                                           byte wearableType, uint nextOwnerMask)
        {
 //            m_log.DebugFormat("[AGENT INVENTORY]: Received request to create inventory item {0} in folder {1}", name, folderID);
-            
            if (transactionID == LLUUID.Zero)
            {
-                CachedUserInfo userInfo 
+                CachedUserInfo userInfo
                    = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
-                
                if (userInfo != null)
                {
                    ScenePresence presence;
@@ -666,7 +666,7 @@ namespace OpenSim.Region.Environment.Scenes
                else
                {
                    m_log.ErrorFormat(
-                        "userInfo for agent uuid {0} unexpectedly null in CreateNewInventoryItem", 
+                        "userInfo for agent uuid {0} unexpectedly null in CreateNewInventoryItem",
                        remoteClient.AgentId);
                }
            }
@@ -677,10 +677,10 @@ namespace OpenSim.Region.Environment.Scenes
                {
                    agentTransactions.HandleItemCreationFromTransaction(
                    remoteClient, transactionID, folderID, callbackID, description,
-                    name, invType, assetType, wearableType, nextOwnerMask); 
+                    name, invType, assetType, wearableType, nextOwnerMask);
                }
-                                
            }
        }
@@ -693,13 +693,13 @@ namespace OpenSim.Region.Environment.Scenes
        {
            CachedUserInfo userInfo
                = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
-            
            if (userInfo == null)
            {
                m_log.WarnFormat(
                    "[AGENT INVENTORY]: Failed to find user {0} {1} to delete inventory item {2}",
                    remoteClient.Name, remoteClient.AgentId, itemID);
-                
                return;
            }
@@ -716,7 +716,7 @@ namespace OpenSim.Region.Environment.Scenes
        {
            CachedUserInfo userInfo
                = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
-            
            if (userInfo == null)
            {
                m_log.Warn("[AGENT INVENTORY]: Failed to find user " + remoteClient.AgentId.ToString());
@@ -726,13 +726,13 @@ namespace OpenSim.Region.Environment.Scenes
            if (userInfo.RootFolder != null)
            {
                InventoryItemBase folder = userInfo.RootFolder.FindItem(folderID);
-                
                if (folder != null)
                {
                    m_log.WarnFormat(
                         "[AGENT INVENTORY]: Remove folder not implemented in request by {0} {1} for {2}",
-                         remoteClient.Name, remoteClient.AgentId, folderID); 
+                         remoteClient.Name, remoteClient.AgentId, folderID);
-                    
                    // doesn't work just yet, commented out. will fix in next patch.
                    // userInfo.DeleteItem(folder);
                }
@@ -760,7 +760,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <param name="remoteClient"></param>
        /// <param name="primLocalID"></param>
        public void RequestTaskInventory(IClientAPI remoteClient, uint primLocalID)
-        {    
+        {
            SceneObjectGroup group = GetGroupByPrim(primLocalID);
            if (group != null)
            {
@@ -808,7 +808,7 @@ namespace OpenSim.Region.Environment.Scenes
                    localID);
            }
        }
-        
        /// <summary>
        /// Move the given item in the given prim to a folder in the client's inventory
        /// </summary>
@@ -819,33 +819,33 @@ namespace OpenSim.Region.Environment.Scenes
        public void MoveTaskInventoryItem(IClientAPI remoteClient, LLUUID folderId, uint primLocalId, LLUUID itemId)
        {
            SceneObjectPart part = GetSceneObjectPart(primLocalId);
-            
            if (null == part)
            {
                m_log.WarnFormat(
                    "[PRIM INVENTORY]: " +
                    "Move of inventory item {0} from prim with local id {1} failed because the prim could not be found",
                    itemId, primLocalId);
-                
                return;
-            }      
+            }
-            
            TaskInventoryItem taskItem = part.GetInventoryItem(itemId);
-            
            if (null == taskItem)
            {
                // Console already notified of error in GetInventoryItem
                return;
            }
-            
            // Only owner can copy
            if (remoteClient.AgentId != taskItem.OwnerID)
            {
                return;
            }
-            
            InventoryItemBase agentItem = new InventoryItemBase();
-            
            agentItem.ID = LLUUID.Random();
            agentItem.Creator = taskItem.CreatorID;
            agentItem.Owner = remoteClient.AgentId;
@@ -855,33 +855,33 @@ namespace OpenSim.Region.Environment.Scenes
            agentItem.AssetType = taskItem.Type;
            agentItem.InvType = taskItem.InvType;
            agentItem.Folder = folderId;
-            
            if ((remoteClient.AgentId != taskItem.OwnerID) && ExternalChecks.ExternalChecksPropagatePermissions())
            {
                agentItem.BasePermissions = taskItem.NextOwnerMask;
                agentItem.CurrentPermissions = taskItem.NextOwnerMask;
                agentItem.NextPermissions = taskItem.NextOwnerMask;
-                                agentItem.EveryOnePermissions = taskItem.EveryoneMask & taskItem.NextOwnerMask;
+                agentItem.EveryOnePermissions = taskItem.EveryoneMask & taskItem.NextOwnerMask;
            }
            else
            {
                agentItem.BasePermissions = taskItem.BaseMask;
                agentItem.CurrentPermissions = taskItem.OwnerMask;
                agentItem.NextPermissions = taskItem.NextOwnerMask;
-                                agentItem.EveryOnePermissions = taskItem.EveryoneMask;
+                agentItem.EveryOnePermissions = taskItem.EveryoneMask;
            }
-                
            AddInventoryItem(remoteClient, agentItem);
-                        if (!ExternalChecks.ExternalChecksBypassPermissions())
+            if (!ExternalChecks.ExternalChecksBypassPermissions())
-                        {
+            {
-                                if((taskItem.OwnerMask & (uint)PermissionMask.Copy) == 0)
+                if ((taskItem.OwnerMask & (uint)PermissionMask.Copy) == 0)
-                                        part.RemoveInventoryItem(itemId);
+                    part.RemoveInventoryItem(itemId);
-                        }
+            }
-                                
        }
        /// <summary>
-        /// Update an item in a prim (task) inventory.  
+        /// Update an item in a prim (task) inventory.
        /// This method does not handle scripts, <see>RezScript(IClientAPI, LLUUID, unit)</see>
        /// </summary>
        /// <param name="remoteClient"></param>
@@ -915,14 +915,14 @@ namespace OpenSim.Region.Environment.Scenes
                        {
                            part.ParentGroup.AddInventoryItem(remoteClient, primLocalID, item, copyID);
                            m_log.InfoFormat(
-                                "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", 
+                                "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
                                item.Name, primLocalID, remoteClient.Name);
                            part.ParentGroup.GetProperties(remoteClient);
-                                                        if (!ExternalChecks.ExternalChecksBypassPermissions())
+                            if (!ExternalChecks.ExternalChecksBypassPermissions())
-                                                        {
+                            {
-                                                                if((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+                                if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
-                                                                        RemoveInventoryItem(remoteClient, itemID);
+                                    RemoveInventoryItem(remoteClient, itemID);
-                                                        }
+                            }
                        }
                        else
                        {
@@ -951,22 +951,22 @@ namespace OpenSim.Region.Environment.Scenes
        public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID)
        {
            LLUUID copyID = LLUUID.Random();
-            
            if (itemID != LLUUID.Zero)
            {
                CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
-            
                if (userInfo != null && userInfo.RootFolder != null)
                {
                    InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
-                    
                    // Try library
                    // XXX clumsy, possibly should be one call
                    if (null == item)
                    {
                        item = CommsManager.UserProfileCacheService.libraryRoot.FindItem(itemID);
                    }
-                        
                    if (item != null)
                    {
                        SceneObjectPart part = GetSceneObjectPart(localID);
@@ -975,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes
                            part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID);
                            part.ParentGroup.StartScript(localID, copyID);
                            part.ParentGroup.GetProperties(remoteClient);
-    
    //                        m_log.InfoFormat("[PRIMINVENTORY]: " +
    //                                         "Rezzed script {0} into prim local ID {1} for user {2}",
    //                                         item.inventoryName, localID, remoteClient.Name);
@@ -1000,10 +1000,10 @@ namespace OpenSim.Region.Environment.Scenes
            else  // If the itemID is zero then the script has been rezzed directly in an object's inventory
            {
                // not yet implemented
-                // TODO Need to get more details from original RezScript packet                
+                // TODO Need to get more details from original RezScript packet
                // XXX jc tmp
 //                AssetBase asset = CreateAsset("chimney sweep", "sailor.lsl", 10, 10, null);
-//                AssetCache.AddAsset(asset);            
+//                AssetCache.AddAsset(asset);
            }
        }
@@ -1023,11 +1023,11 @@ namespace OpenSim.Region.Environment.Scenes
            else
            {
                foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
-                {            
+                {
 //                    m_log.DebugFormat(
 //                        "[AGENT INVENTORY]: Received request to derez {0} into folder {1}",
 //                        Data.ObjectLocalID, DeRezPacket.AgentBlock.DestinationID);
-                    
                    EntityBase selectedEnt = null;
                    //m_log.Info("[CLIENT]: LocalID:" + Data.ObjectLocalID.ToString());
@@ -1046,9 +1046,9 @@ namespace OpenSim.Region.Environment.Scenes
                        bool permissionToTake = false;
                        bool permissionToDelete = false;
                        if (DeRezPacket.AgentBlock.Destination == 1)// Take Copy
-                        { 
+                        {
                            permissionToTake = ExternalChecks.ExternalChecksCanTakeCopyObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId);
-                            permissionToDelete = false; //Just taking copy! 
+                            permissionToDelete = false; //Just taking copy!
                        }
                        else if (DeRezPacket.AgentBlock.Destination == 4) //Take
@@ -1094,27 +1094,27 @@ namespace OpenSim.Region.Environment.Scenes
                                item.Folder = DeRezPacket.AgentBlock.DestinationID;
                                if ((remoteClient.AgentId != objectGroup.RootPart.OwnerID) && ExternalChecks.ExternalChecksPropagatePermissions())
                                {
-                                                                        uint perms=objectGroup.GetEffectivePermissions();
+                                    uint perms=objectGroup.GetEffectivePermissions();
-                                                                        uint nextPerms=(perms & 7) << 13;
+                                    uint nextPerms=(perms & 7) << 13;
-                                                                        if((nextPerms & (uint)PermissionMask.Copy) == 0)
+                                    if ((nextPerms & (uint)PermissionMask.Copy) == 0)
-                                                                                perms &= ~(uint)PermissionMask.Copy;
+                                        perms &= ~(uint)PermissionMask.Copy;
-                                                                        if((nextPerms & (uint)PermissionMask.Transfer) == 0)
+                                    if ((nextPerms & (uint)PermissionMask.Transfer) == 0)
-                                                                                perms &= ~(uint)PermissionMask.Transfer;
+                                        perms &= ~(uint)PermissionMask.Transfer;
-                                                                        if((nextPerms & (uint)PermissionMask.Modify) == 0)
+                                    if ((nextPerms & (uint)PermissionMask.Modify) == 0)
-                                                                                perms &= ~(uint)PermissionMask.Modify;
+                                        perms &= ~(uint)PermissionMask.Modify;
                                    item.BasePermissions = perms & objectGroup.RootPart.NextOwnerMask;
                                    item.CurrentPermissions = item.BasePermissions;
                                    item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
-                                                                        item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask;
+                                    item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask;
-                                                                        item.CurrentPermissions |= 8; // Slam!
+                                    item.CurrentPermissions |= 8; // Slam!
                                }
                                else
                                {
                                    item.BasePermissions = objectGroup.GetEffectivePermissions();
                                    item.CurrentPermissions = objectGroup.GetEffectivePermissions();
                                    item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
-                                                                        item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
+                                    item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
                                }
                                // TODO: add the new fields (Flags, Sale info, etc)
@@ -1201,15 +1201,15 @@ namespace OpenSim.Region.Environment.Scenes
                        item.BasePermissions = objectGroup.RootPart.NextOwnerMask;
                        item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask;
                        item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
-                                                item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask;
+                        item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask;
                    }
-                                        else
+                    else
-                                        {
+                    {
                        item.BasePermissions = objectGroup.GetEffectivePermissions();
                        item.CurrentPermissions = objectGroup.GetEffectivePermissions();
                        item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
-                                                item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
+                        item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
-                                        }
+                    }
                    userInfo.AddItem(item);
@@ -1218,7 +1218,7 @@ namespace OpenSim.Region.Environment.Scenes
                    {
                        remoteClient.SendInventoryItemCreateUpdate(item);
                    }
-                    
                }
            }
        }
@@ -1250,7 +1250,7 @@ namespace OpenSim.Region.Environment.Scenes
                    item.Name = asset.Name;
                    item.AssetType = asset.Type;
                    item.InvType = asset.InvType;
-                    
                    // Sticking it in root folder for now..    objects folder later?
                    item.Folder = userInfo.RootFolder.ID;// DeRezPacket.AgentBlock.DestinationID;
@@ -1259,14 +1259,14 @@ namespace OpenSim.Region.Environment.Scenes
                        item.BasePermissions = objectGroup.RootPart.NextOwnerMask;
                        item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask;
                        item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
-                                                item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask;
+                        item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask;
                    }
                    else
                    {
                        item.BasePermissions = objectGroup.RootPart.BaseMask;
                        item.CurrentPermissions = objectGroup.RootPart.OwnerMask;
                        item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
-                                                item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
+                        item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
                    }
                    userInfo.AddItem(item);
@@ -1345,12 +1345,12 @@ namespace OpenSim.Region.Environment.Scenes
            LLVector3 scale = new LLVector3(0.5f, 0.5f, 0.5f);
-            
            LLVector3 pos = GetNewRezLocation(
-                      RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1), 
+                      RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1),
                      BypassRayCast, bRayEndIsIntersection,true,scale, false);
-            
-            
            // Rez object
            CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
@@ -1359,14 +1359,14 @@ namespace OpenSim.Region.Environment.Scenes
                if (userInfo.RootFolder != null)
                {
                    InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
-                    
                    if (item != null)
                    {
                        AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false);
                        if (rezAsset != null)
                        {
-                            string xmlData = Helpers.FieldToUTF8String(rezAsset.Data);                            
+                            string xmlData = Helpers.FieldToUTF8String(rezAsset.Data);
                            SceneObjectGroup group = new SceneObjectGroup(this, m_regionHandle, xmlData);
                            if (!ExternalChecks.ExternalChecksCanRezObject(group.Children.Count,remoteClient.AgentId, pos) && !attachment)
                            {
@@ -1401,10 +1401,10 @@ namespace OpenSim.Region.Environment.Scenes
                                if (attachment)
                                    isAttachment = " Object was an attachment";
-                             
                                m_log.Error("[OJECTREZ]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment);
                            }
-                            
                            // Since renaming the item in the inventory does not affect the name stored
                            // in the serialization, transfer the correct name from the inventory to the
                            // object itself before we rez.
@@ -1413,18 +1413,18 @@ namespace OpenSim.Region.Environment.Scenes
                            List<SceneObjectPart> partList = new List<SceneObjectPart>(group.Children.Values);
-                                                        if(rootPart.OwnerID != item.Owner)
+                            if (rootPart.OwnerID != item.Owner)
-                                                        {
+                            {
-                                                                if((item.CurrentPermissions & 8) != 0)
+                                if ((item.CurrentPermissions & 8) != 0)
-                                                                {
+                                {
-                                                                        foreach (SceneObjectPart part in partList)
+                                    foreach (SceneObjectPart part in partList)
-                                                                        {
+                                    {
-                                                                                part.EveryoneMask = item.EveryOnePermissions;
+                                        part.EveryoneMask = item.EveryOnePermissions;
-                                                                                part.NextOwnerMask = item.NextPermissions;
+                                        part.NextOwnerMask = item.NextPermissions;
-                                                                        }
+                                    }
-                                                                }
+                                }
-                                                                group.ApplyNextOwnerPermissions();
+                                group.ApplyNextOwnerPermissions();
-                                                        }
+                            }
                            foreach (SceneObjectPart part in partList)
                            {
@@ -1434,13 +1434,13 @@ namespace OpenSim.Region.Environment.Scenes
                                    part.OwnerID = item.Owner;
                                    part.ChangeInventoryOwner(item.Owner);
                                }
-                                                                else if(((item.CurrentPermissions & 8) != 0) && (!attachment)) // Slam!
+                                else if (((item.CurrentPermissions & 8) != 0) && (!attachment)) // Slam!
-                                                                {
+                                {
                                    part.EveryoneMask = item.EveryOnePermissions;
                                    part.NextOwnerMask = item.NextPermissions;
-                                                                }
+                                }
                            }
- 
                            rootPart.TrimPermissions();
                            if (!attachment)
@@ -1451,11 +1451,11 @@ namespace OpenSim.Region.Environment.Scenes
                                }
                                group.ApplyPhysics(m_physicalPrim);
                            }
-                            
                            group.StartScripts();
-                            
                            if (!attachment)
                                rootPart.ScheduleFullUpdate();
@@ -1505,18 +1505,18 @@ namespace OpenSim.Region.Environment.Scenes
                    List<SceneObjectPart> partList = new List<SceneObjectPart>(group.Children.Values);
-                                        if(rootPart.OwnerID != item.OwnerID)
+                    if (rootPart.OwnerID != item.OwnerID)
-                                        {
+                    {
-                                                if((item.OwnerMask & 8) != 0)
+                        if ((item.OwnerMask & 8) != 0)
-                                                {
+                        {
-                                                        foreach (SceneObjectPart part in partList)
+                            foreach (SceneObjectPart part in partList)
-                                                        {
+                            {
-                                                                part.EveryoneMask = item.EveryoneMask;
+                                part.EveryoneMask = item.EveryoneMask;
-                                                                part.NextOwnerMask = item.NextOwnerMask;
+                                part.NextOwnerMask = item.NextOwnerMask;
-                                                        }
+                            }
-                                                }
+                        }
-                                                group.ApplyNextOwnerPermissions();
+                        group.ApplyNextOwnerPermissions();
-                                        }
+                    }
                    foreach (SceneObjectPart part in partList)
                    {
@@ -1526,11 +1526,11 @@ namespace OpenSim.Region.Environment.Scenes
                            part.OwnerID = item.OwnerID;
                            part.ChangeInventoryOwner(item.OwnerID);
                        }
-                                                else if((item.OwnerMask & 8) != 0) // Slam!
+                        else if ((item.OwnerMask & 8) != 0) // Slam!
-                                                {
+                        {
-                                                        part.EveryoneMask = item.EveryoneMask;
+                            part.EveryoneMask = item.EveryoneMask;
-                                                        part.NextOwnerMask = item.NextOwnerMask;
+                            part.NextOwnerMask = item.NextOwnerMask;
-                                                }
+                        }
                    }
                    rootPart.TrimPermissions();
                    if (group.RootPart.Shape.PCode == (byte)PCode.Prim)
@@ -1548,6 +1548,6 @@ namespace OpenSim.Region.Environment.Scenes
            }
            return null;
        }
-        
    }
 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index f55d822..c486e28 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Environment.Scenes
    public partial class Scene
    {
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="message"></param>
        /// <param name="type"></param>
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Environment.Scenes
            foreach (EntityBase ent in EntitieList)
            {
                if (ent is SceneObjectGroup)
-                {                    
+                {
                    if (((SceneObjectGroup) ent).LocalId == primLocalID)
                    {
                        // A prim is only tainted if it's allowed to be edited by the person clicking it.
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="primLocalID"></param>
        /// <param name="remoteClient"></param>
@@ -139,10 +139,10 @@ namespace OpenSim.Region.Environment.Scenes
               agentId, groupId, final, groupOwned, removeContribution, parcelLocalID, parcelArea, parcelPrice, authenticated);
            // First, allow all validators a stab at it
-            m_eventManager.TriggerValidateLandBuy(this, args);        
+            m_eventManager.TriggerValidateLandBuy(this, args);
            // Then, check validation and transfer
-            m_eventManager.TriggerLandBuy(this, args);        
+            m_eventManager.TriggerLandBuy(this, args);
        }
        public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1964ef4..32dc7d5 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// Each agent has its own capabilities handler.
        /// </summary>
        protected Dictionary<LLUUID, Caps> m_capsHandlers = new Dictionary<LLUUID, Caps>();
-        
        protected BaseHttpServer m_httpListener;
        protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>();
@@ -135,7 +135,7 @@ namespace OpenSim.Region.Environment.Scenes
        private int m_update_backup = 200;
        private int m_update_terrain = 50;
        private int m_update_land = 1;
-        
        private int frameMS = 0;
        private int physicsMS2 = 0;
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Environment.Scenes
            get { return m_innerScene.Entities; }
            set { m_innerScene.Entities = value; }
        }
-        
        public Dictionary<LLUUID, ScenePresence> m_restorePresences
        {
            get { return m_innerScene.RestorePresences; }
@@ -324,14 +324,14 @@ namespace OpenSim.Region.Environment.Scenes
        public override bool OtherRegionUp(RegionInfo otherRegion)
        {
-            // Another region is up.  
+            // Another region is up.
            // Gets called from Grid Comms (SceneCommunicationService<---RegionListener<----LocalBackEnd<----OGS1)
-            // We have to tell all our ScenePresences about it.. 
+            // We have to tell all our ScenePresences about it..
            // and add it to the neighbor list.
            // We only add it to the neighbor list if it's within 1 region from here.
-            // Agents may have draw distance values that cross two regions though, so 
+            // Agents may have draw distance values that cross two regions though, so
-            // we add it to the notify list regardless of distance.  
+            // we add it to the notify list regardless of distance.
            // We'll check the agent's draw distance before notifying them though.
@@ -339,9 +339,9 @@ namespace OpenSim.Region.Environment.Scenes
            {
                for (int i = 0; i < m_neighbours.Count; i++)
                {
-                    // The purpose of this loop is to re-update the known neighbors 
+                    // The purpose of this loop is to re-update the known neighbors
                    // when another region comes up on top of another one.
-                    // The latest region in that location ends up in the 
+                    // The latest region in that location ends up in the
                    // 'known neighbors list'
                    // Additionally, the commFailTF property gets reset to false.
                    if (m_neighbours[i].RegionHandle == otherRegion.RegionHandle)
@@ -354,7 +354,7 @@ namespace OpenSim.Region.Environment.Scenes
                }
                // If the value isn't in the neighbours, add it.
-                // If the RegionInfo isn't exact but is for the same XY World location, 
+                // If the RegionInfo isn't exact but is for the same XY World location,
                // then the above loop will fix that.
                if (!(CheckNeighborRegion(otherRegion)))
@@ -431,8 +431,8 @@ namespace OpenSim.Region.Environment.Scenes
                }
            }
            return found;
-        
-                    
        }
        public virtual void Restart(float seconds)
        {
@@ -461,8 +461,8 @@ namespace OpenSim.Region.Environment.Scenes
            }
        }
-        // The Restart timer has occured.  
+        // The Restart timer has occured.
-        // We have to figure out if this is a notification or if the number of seconds specified in Restart 
+        // We have to figure out if this is a notification or if the number of seconds specified in Restart
        // have elapsed.
        // If they have elapsed, call RestartNow()
        public void RestartTimer_Elapsed(object sender, ElapsedEventArgs e)
@@ -500,7 +500,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        // This is a helper function that notifies root agents in this region that a new sim near them has come up
-        // This is in the form of a timer because when an instance of OpenSim.exe is started, 
+        // This is in the form of a timer because when an instance of OpenSim.exe is started,
        // Even though the sims initialize, they don't listen until 'all of the sims are initialized'
        // If we tell an agent about a sim that's not listening yet, the agent will not be able to connect to it.
        // subsequently the agent will never see the region come back online.
@@ -730,7 +730,7 @@ namespace OpenSim.Region.Environment.Scenes
                if (m_frame % m_update_entities == 0)
                    m_innerScene.UpdateEntities();
-                // run through entities that have scheduled themselves for 
+                // run through entities that have scheduled themselves for
                // updates looking for updates(faster)
                if (m_frame % m_update_entitiesquick == 0)
                    m_innerScene.ProcessUpdates();
@@ -743,13 +743,13 @@ namespace OpenSim.Region.Environment.Scenes
                {
                    if (m_frame % m_update_events == 0)
                        UpdateEvents();
-    
                    if (m_frame % m_update_backup == 0)
                        UpdateStorageBackup();
-    
                    if (m_frame % m_update_terrain == 0)
                        UpdateTerrain();
-    
                    if (m_frame % m_update_land == 0)
                        UpdateLand();
                    otherMS = System.Environment.TickCount - otherMS;
@@ -800,14 +800,14 @@ namespace OpenSim.Region.Environment.Scenes
                // Get actual time dilation
                float tmpval = (m_timespan / (float)SinceLastFrame.TotalSeconds);
-                // If actual time dilation is greater then one, we're catching up, so subtract 
+                // If actual time dilation is greater then one, we're catching up, so subtract
                // the amount that's greater then 1 from the time dilation
                if (tmpval > 1.0)
                {
                    tmpval = tmpval - (tmpval - 1.0f);
                }
                m_timedilation = tmpval;
-               
                m_lastupdate = DateTime.Now;
            }
        }
@@ -858,9 +858,9 @@ namespace OpenSim.Region.Environment.Scenes
        {
            ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); });
        }
-         
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <returns></returns>
        public bool Backup()
@@ -929,7 +929,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// Loads the World heightmap
        /// </summary>
-        /// 
+        ///
        public override void LoadWorldMap()
        {
            try
@@ -946,7 +946,7 @@ namespace OpenSim.Region.Environment.Scenes
                {
                    Heightmap = new TerrainChannel(map);
                }
-               
            }
            catch (Exception e)
            {
@@ -961,13 +961,13 @@ namespace OpenSim.Region.Environment.Scenes
        public void RegisterRegionWithGrid()
        {
            RegisterCommsEvents();
-            
            // These two 'commands' *must be* next to each other or sim rebooting fails.
            m_sceneGridService.RegisterRegion(RegionInfo);
            m_sceneGridService.InformNeighborsThatRegionisUp(RegionInfo);
-            
            Dictionary<string, string> dGridSettings = m_sceneGridService.GetGridSettings();
-            
            if (dGridSettings.ContainsKey("allow_forceful_banlines"))
            {
                if (dGridSettings["allow_forceful_banlines"] != "TRUE")
@@ -984,11 +984,11 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void CreateTerrainTexture(bool temporary)
        {
-            //create a texture asset of the terrain 
+            //create a texture asset of the terrain
            IMapImageGenerator terrain = RequestModuleInterface<IMapImageGenerator>();
            // Cannot create a map for a nonexistant heightmap yet.
@@ -1129,7 +1129,7 @@ namespace OpenSim.Region.Environment.Scenes
                    AssetCache.AddAsset(asset);
                }
            }
-            
        }
        #endregion
@@ -1211,7 +1211,7 @@ namespace OpenSim.Region.Environment.Scenes
            if (RayTargetID != LLUUID.Zero)
            {
                SceneObjectPart target = GetSceneObjectPart(RayTargetID);
-                
                LLVector3 direction = LLVector3.Norm(RayEnd - RayStart);
                Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z);
                Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);
@@ -1220,9 +1220,9 @@ namespace OpenSim.Region.Environment.Scenes
                {
                    pos = target.AbsolutePosition;
                    //m_log.Info("[OBJECT_REZ]: TargetPos: " + pos.ToString() + ", RayStart: " + RayStart.ToString() + ", RayEnd: " + RayEnd.ToString() + ", Volume: " + Util.GetDistanceTo(RayStart,RayEnd).ToString() + ", mag1: " + Util.GetMagnitude(RayStart).ToString() + ", mag2: " + Util.GetMagnitude(RayEnd).ToString());
-                    
                    // TODO: Raytrace better here
-                    
                    //EntityIntersection ei = m_innerScene.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection));
                    Ray NewRay = new Ray(AXOrigin, AXdirection);
@@ -1246,13 +1246,13 @@ namespace OpenSim.Region.Environment.Scenes
                        // Set the position to the intersection point
                        LLVector3 offset = (normal * (ScaleOffset / 2f));
                        pos = (intersectionpoint + offset);
-                        
                        // Un-offset the prim (it gets offset later by the consumer method)
                        pos.Z -= 0.25F;
-                        
-                    } 
+                    }
-                        
-                    
                    return pos;
                }
                else
@@ -1267,8 +1267,8 @@ namespace OpenSim.Region.Environment.Scenes
                    if (ei.HitTF)
                    {
                        pos = new LLVector3(ei.ipoint.x, ei.ipoint.y, ei.ipoint.z);
-                    } 
+                    }
-                    
                    return pos;
                }
            }
@@ -1284,7 +1284,7 @@ namespace OpenSim.Region.Environment.Scenes
                                       byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID,
                                       byte RayEndIsIntersection)
        {
-           
            LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f,0.5f,0.5f), false);
            if ( ExternalChecks.ExternalChecksCanRezObject(1,ownerID,pos))
@@ -1386,11 +1386,11 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// Locate New region Handle and offset the prim position for the new region
-        /// 
+        ///
        /// </summary>
        /// <param name="position">current position of Group</param>
        /// <param name="grp">Scene Object Group that we're crossing</param>
- 
        public void CrossPrimGroupIntoNewRegion(LLVector3 position, SceneObjectGroup grp)
        {
            if (grp == null)
@@ -1424,7 +1424,7 @@ namespace OpenSim.Region.Environment.Scenes
                pos.X = ((pos.X - Constants.RegionSize));
                newRegionHandle = Util.UIntsToLong((uint)((thisx + 1) * Constants.RegionSize), (uint)(thisy * Constants.RegionSize));
-                
                // x + 1
            }
            else if (position.X < -0.1f)
@@ -1449,7 +1449,7 @@ namespace OpenSim.Region.Environment.Scenes
            // Offset the positions for the new region across the border
            grp.OffsetForNewRegion(pos);
-            
            CrossPrimGroupIntoNewRegion(newRegionHandle, grp);
        }
@@ -1507,7 +1507,7 @@ namespace OpenSim.Region.Environment.Scenes
                                if (sp != null)
                                {
                                    // hack assetID until we get assetID into the XML format.
-                                    // LastOwnerID is used for group deeding, so when you do stuff 
+                                    // LastOwnerID is used for group deeding, so when you do stuff
                                    // with the deeded object, it goes back to them
                                    grp.SetFromAssetID(grp.RootPart.LastOwnerID);
@@ -1515,7 +1515,7 @@ namespace OpenSim.Region.Environment.Scenes
                                }
                            }
                        }
-                    
                    }
                }
@@ -1533,16 +1533,16 @@ namespace OpenSim.Region.Environment.Scenes
        #region Add/Remove Avatar Methods
        /// <summary>
-        /// 
+        ///
        /// </summary>
-        /// <param name="client"></param          
+        /// <param name="client"></param
        /// <param name="child"></param>
        public override void AddNewClient(IClientAPI client, bool child)
        {
            m_log.DebugFormat(
-                "[CONNECTION DEBUGGING]: Creating new client for {0} at {1}", 
+                "[CONNECTION DEBUGGING]: Creating new client for {0} at {1}",
                client.AgentId, RegionInfo.RegionName);
-            
            SubscribeToClientEvents(client);
            ScenePresence presence;
@@ -1618,7 +1618,7 @@ namespace OpenSim.Region.Environment.Scenes
            client.OnObjectDuplicateOnRay += doObjectDuplicateOnRay;
            client.OnUpdatePrimFlags += m_innerScene.UpdatePrimFlags;
            client.OnRequestObjectPropertiesFamily += m_innerScene.RequestObjectPropertiesFamily;
-            
            client.OnRequestGodlikePowers += handleRequestGodlikePowers;
            client.OnGodKickUser += HandleGodlikeKickUser;
            client.OnObjectPermissions += HandleObjectPermissionsUpdate;
@@ -1655,7 +1655,7 @@ namespace OpenSim.Region.Environment.Scenes
            client.OnSetStartLocationRequest += SetHomeRezPoint;
            client.OnUndo += m_innerScene.HandleUndo;
-            
            EventManager.TriggerOnNewClient(client);
        }
        public virtual void TeleportClientHome(LLUUID AgentId, IClientAPI client)
@@ -1669,14 +1669,14 @@ namespace OpenSim.Region.Environment.Scenes
                RequestTeleportLocation(client, homeRegion, homePostion,homeLookat,(uint)0);
            }
        }
-        
        public void doObjectDuplicateOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID,
                                              LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart,
                                              bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates)
-        {           
+        {
            LLVector3 pos;
            const bool frontFacesOnly = true;
-           
            SceneObjectPart target = GetSceneObjectPart(localID);
            SceneObjectPart target2 = GetSceneObjectPart(RayTargetObj);
@@ -1685,8 +1685,8 @@ namespace OpenSim.Region.Environment.Scenes
                LLVector3 direction = LLVector3.Norm(RayEnd - RayStart);
                Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z);
-                Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);                
+                Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);
-                
                if (target2.ParentGroup != null)
                {
                    pos = target2.AbsolutePosition;
@@ -1717,7 +1717,7 @@ namespace OpenSim.Region.Environment.Scenes
                        LLVector3 normal = new LLVector3(ei.normal.x, ei.normal.y, ei.normal.z);
                        LLVector3 offset = (normal * (ScaleOffset / 2f));
                        pos = (intersectionpoint + offset);
-                        
                        if (CopyCenters)
                        {
                            //  now we cast a ray from inside the prim(absolute position) to one of it's faces along the face normal.
@@ -1735,7 +1735,7 @@ namespace OpenSim.Region.Environment.Scenes
                                normal.Z = ei2.normal.z;
                            }
                        }
-                        
                        // Set the position to the intersection point
                        offset = (normal * (ScaleOffset / 2f));
                        pos = (intersectionpoint + offset);
@@ -1749,8 +1749,8 @@ namespace OpenSim.Region.Environment.Scenes
                    return;
                }
                return;
-                
-              
            }
@@ -1776,7 +1776,7 @@ namespace OpenSim.Region.Environment.Scenes
                UserProfile.HomeLookAtY = (int)lookAt.Y;
                UserProfile.HomeLookAtZ = (int)lookAt.Z;
                CommsManager.UserService.UpdateUserProfileProperties(UserProfile);
-                
                remoteClient.SendAgentAlertMessage("Set home to here if supported by login service",false);
            }
            else
@@ -1784,7 +1784,7 @@ namespace OpenSim.Region.Environment.Scenes
                remoteClient.SendAgentAlertMessage("Set Home request Failed",false);
            }
        }
-        
        protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
        {
            AvatarAppearance appearance;
@@ -1844,7 +1844,7 @@ namespace OpenSim.Region.Environment.Scenes
                    m_sceneGridService.SendCloseChildAgentConnections(agentID, childknownRegions);
                    RemoveCapsHandler(agentID);
-                    
                    CommsManager.UserProfileCacheService.RemoveUser(agentID);
                }
@@ -1870,7 +1870,7 @@ namespace OpenSim.Region.Environment.Scenes
            ForEachScenePresence(
                delegate(ScenePresence presence) { presence.CoarseLocationChange(); });
-           
            IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
            if (agentTransactions != null)
            {
@@ -1921,7 +1921,7 @@ namespace OpenSim.Region.Environment.Scenes
            }
            //m_log.InfoFormat("[SCENE] Memory pre  GC {0}", System.GC.GetTotalMemory(false));
-            //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));            
+            //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
        }
        public void HandleRemoveKnownRegionsFromAvatar(LLUUID avatarID, List<ulong> regionslst)
@@ -1931,7 +1931,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                lock (av)
                {
-               
                    for (int i = 0; i < regionslst.Count; i++)
                    {
                        av.KnownChildRegions.Remove(regionslst[i]);
@@ -1957,7 +1957,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Entities
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="entID"></param>
        /// <returns></returns>
@@ -1983,7 +1983,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region RegionComms
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void RegisterCommsEvents()
        {
@@ -1999,7 +1999,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void UnRegisterReginWithComms()
        {
@@ -2026,7 +2026,7 @@ namespace OpenSim.Region.Environment.Scenes
            if (regionHandle == m_regInfo.RegionHandle)
            {
                capsPaths[agent.AgentID] = agent.CapsPath;
-                    
                if (!agent.child)
                {
                    AddCapsHandler(agent.AgentID);
@@ -2041,44 +2041,44 @@ namespace OpenSim.Region.Environment.Scenes
                        }
                    }
                }
-                
                m_log.DebugFormat(
                    "[CONNECTION DEBUGGING]: Creating new circuit code ({0}) for avatar {1} at {2}",
                    agent.circuitcode, agent.AgentID, RegionInfo.RegionName);
-                
                m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
            }
            else
            {
                m_log.WarnFormat(
-                    "[CONNECTION DEBUGGING]: Skipping this region for welcoming avatar {0} [{1}] at {2}", 
+                    "[CONNECTION DEBUGGING]: Skipping this region for welcoming avatar {0} [{1}] at {2}",
                    agent.AgentID, regionHandle, RegionInfo.RegionName);
            }
-        }                
+        }
        /// <summary>
        /// Add a caps handler for the given agent.  If the CAPS handler already exists for this agent,
        /// then it is replaced by a new CAPS handler.
-        /// 
+        ///
        /// FIXME: On login this is called twice, once for the login and once when the connection is made.
        /// This is somewhat innefficient and should be fixed.  The initial login creation is necessary
        /// since the client asks for capabilities immediately after being informed of the seed.
        /// </summary>
-        /// <param name="agentId"></param>   
+        /// <param name="agentId"></param>
-        /// <param name="capsObjectPath"></param>         
+        /// <param name="capsObjectPath"></param>
        public void AddCapsHandler(LLUUID agentId)
-        {                             
+        {
-            String capsObjectPath = GetCapsPath(agentId);                
+            String capsObjectPath = GetCapsPath(agentId);
            m_log.DebugFormat(
                "[CAPS]: Setting up CAPS handler for root agent {0} in {1}",
                agentId, RegionInfo.RegionName);
-                
            Caps cap =
                new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port,
                         capsObjectPath, agentId, m_dumpAssetsToFile, RegionInfo.RegionName);
            cap.RegisterHandlers();
-            
            EventManager.TriggerOnRegisterCaps(agentId, cap);
            cap.AddNewInventoryItem = AddInventoryItem;
@@ -2087,7 +2087,7 @@ namespace OpenSim.Region.Environment.Scenes
            cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS;
            cap.GetClient = m_innerScene.GetControllingClient;
            m_capsHandlers[agentId] = cap;
-        } 
+        }
        /// <summary>
        /// Remove the caps handler for a given agent.
@@ -2100,9 +2100,9 @@ namespace OpenSim.Region.Environment.Scenes
                if (m_capsHandlers.ContainsKey(agentId))
                {
                    m_log.DebugFormat(
-                        "[CAPS]: Removing CAPS handler for root agent {0} in {1}", 
+                        "[CAPS]: Removing CAPS handler for root agent {0} in {1}",
                        agentId, RegionInfo.RegionName);
-                    
                    m_capsHandlers[agentId].DeregisterHandlers();
                    EventManager.TriggerOnDeregisterCaps(agentId, m_capsHandlers[agentId]);
@@ -2118,7 +2118,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="regionHandle"></param>
        /// <param name="agentID"></param>
@@ -2152,8 +2152,8 @@ namespace OpenSim.Region.Environment.Scenes
            ScenePresence childAgentUpdate = GetScenePresence(new LLUUID(cAgentData.AgentID));
            if (childAgentUpdate != null)
            {
-                // I can't imagine *yet* why we would get an update if the agent is a root agent..    
+                // I can't imagine *yet* why we would get an update if the agent is a root agent..
-                // however to avoid a race condition crossing borders..   
+                // however to avoid a race condition crossing borders..
                if (childAgentUpdate.IsChildAgent)
                {
                    uint rRegionX = (uint)(cAgentData.regionHandle >> 40);
@@ -2193,7 +2193,7 @@ namespace OpenSim.Region.Environment.Scenes
                    }
                    // Tell a single agent to disconnect from the region.
                    presence.ControllingClient.SendShutdownConnectionNotice();
-                    
                    presence.ControllingClient.Close(true);
                }
            }
@@ -2202,11 +2202,11 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// Tell neighboring regions about this agent
-        /// When the regions respond with a true value, 
+        /// When the regions respond with a true value,
        /// tell the agents about the region.
-        /// 
+        ///
        /// We have to tell the regions about the agents first otherwise it'll deny them access
-        /// 
+        ///
        /// </summary>
        /// <param name="presence"></param>
        public void InformClientOfNeighbours(ScenePresence presence)
@@ -2309,7 +2309,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Module Methods
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="name"></param>
        /// <param name="module"></param>
@@ -2379,21 +2379,21 @@ namespace OpenSim.Region.Environment.Scenes
                m_statsReporter.SetObjectCapacity(objects);
            }
            objectCapacity = objects;
-            
        }
        public List<FriendListItem> GetFriendList(LLUUID avatarID)
        {
            return CommsManager.GetUserFriendList(avatarID);
        }
-        
        #endregion
        #region Other Methods
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="phase"></param>
        public void SetTimePhase(int phase)
@@ -2402,7 +2402,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="avatarID"></param>
        /// <param name="objectName"></param>
@@ -2437,7 +2437,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="url"></param>
        /// <param name="type"></param>
@@ -2451,14 +2451,14 @@ namespace OpenSim.Region.Environment.Scenes
            }
            return LLUUID.Zero;
        }
-        
        /// <summary>
-        /// This method is a way for the Friends Module to create an instant 
+        /// This method is a way for the Friends Module to create an instant
-        /// message to the avatar and for Instant Messages that travel across 
+        /// message to the avatar and for Instant Messages that travel across
        /// gridcomms to make it to the Instant Message Module.
-        /// 
+        ///
-        /// Friendship establishment and groups are unfortunately tied with instant messaging and 
+        /// Friendship establishment and groups are unfortunately tied with instant messaging and
        /// there's no way to separate them completely.
        /// </summary>
        /// <param name="message">object containing the instant message data</param>
@@ -2525,7 +2525,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="message"></param>
        public void SendGeneralAlert(string message)
@@ -2539,7 +2539,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="agentID"></param>
        /// <param name="message"></param>
@@ -2556,7 +2556,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="agentID"></param>
        /// <param name="sessionID"></param>
@@ -2569,7 +2569,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                // User needs to be logged into this sim
                if (m_scenePresences.ContainsKey(agentID))
-                {   
+                {
                    // First check that this is the sim owner
                    if (ExternalChecks.ExternalChecksCanBeGodLike(agentID))
                    {
@@ -2632,8 +2632,8 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// Kicks User specified from the simulator. This logs them off of the grid
-        /// If the client gets the UUID: 44e87126e7944ded05b37c42da3d5cdb it assumes 
+        /// If the client gets the UUID: 44e87126e7944ded05b37c42da3d5cdb it assumes
-        /// that you're kicking it even if the avatar's UUID isn't the UUID that the 
+        /// that you're kicking it even if the avatar's UUID isn't the UUID that the
        /// agent is assigned
        /// </summary>
        /// <param name="godID">The person doing the kicking</param>
@@ -2662,7 +2662,7 @@ namespace OpenSim.Region.Environment.Scenes
                                                        }
                                );
-                            
                            // This is a bit crude.   It seems the client will be null before it actually stops the thread
                            // The thread will kill itself eventually :/
                            // Is there another way to make sure *all* clients get this 'inter region' message?
@@ -2722,7 +2722,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="firstName"></param>
        /// <param name="lastName"></param>
@@ -2743,7 +2743,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="commandParams"></param>
        public void HandleAlertCommand(string[] commandParams)
@@ -2931,7 +2931,7 @@ namespace OpenSim.Region.Environment.Scenes
        private bool m_dumpAssetsToFile;
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="scriptEngine"></param>
        public void AddScriptEngine(ScriptEngineInterface scriptEngine)
@@ -2978,7 +2978,7 @@ namespace OpenSim.Region.Environment.Scenes
                        {
                            return false;
                        }
-                    } 
+                    }
                    else
                    {
                        if (part.OwnerID == parcel.landData.ownerID)
@@ -2996,7 +2996,7 @@ namespace OpenSim.Region.Environment.Scenes
                    if (pos.X > 0f && pos.X < Constants.RegionSize && pos.Y > 0f && pos.Y < Constants.RegionSize)
                    {
-                        // The only time parcel != null when an object is inside a region is when 
+                        // The only time parcel != null when an object is inside a region is when
                        // there is nothing behind the landchannel.  IE, no land plugin loaded.
                        return true;
                    }
@@ -3027,7 +3027,7 @@ namespace OpenSim.Region.Environment.Scenes
        public bool pipeEventsForScript(uint localID)
        {
-            
            SceneObjectPart part = GetSceneObjectPart(localID);
            if (part != null)
            {
@@ -3046,7 +3046,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region InnerScene wrapper methods
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <returns></returns>
@@ -3071,7 +3071,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="presence"></param>
        public void SendAllSceneObjectsToClient(ScenePresence presence)
@@ -3080,10 +3080,10 @@ namespace OpenSim.Region.Environment.Scenes
        }
        //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. 
+        // ie it could be all m_scenePresences within a certain range of the calling prim/avatar.
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <returns></returns>
        public List<ScenePresence> GetAvatars()
@@ -3132,7 +3132,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="action"></param>
        public void ForEachScenePresence(Action<ScenePresence> action)
@@ -3154,13 +3154,13 @@ namespace OpenSim.Region.Environment.Scenes
                }
            }
        }
-        
        /// <summary>
        /// Delete this object from the scene.
        /// </summary>
        /// <param name="group"></param>
        public void DeleteSceneObjectGroup(SceneObjectGroup group)
-        {           
+        {
            SceneObjectPart rootPart = (group).GetChildPart(group.UUID);
            if (rootPart.PhysActor != null)
            {
@@ -3177,18 +3177,18 @@ namespace OpenSim.Region.Environment.Scenes
                m_innerScene.RemoveAPrimCount();
            }
            group.DeleteParts();
-            
            // In case anybody else retains a reference to this group, signal deletion by changing the name
            // to null.  We can't zero out the UUID because this is taken from the root part, which has already
            // been removed.
            // FIXME: This is a really poor temporary solution, since it still leaves plenty of scope for race
            // conditions where a user deletes an entity while it is being stored.  Really, the update
            // code needs a redesign.
-            group.Name = null;          
+            group.Name = null;
-        }        
+        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="action"></param>
        //        public void ForEachObject(Action<SceneObjectGroup> action)
@@ -3207,7 +3207,7 @@ namespace OpenSim.Region.Environment.Scenes
        //        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <returns></returns>
@@ -3217,7 +3217,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="fullID"></param>
        /// <returns></returns>
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index dc67436..fbef367 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -77,11 +77,11 @@ namespace OpenSim.Region.Environment.Scenes
        {
            get { return m_externalChecks; }
        }
-        
        protected string m_datastore;
        private uint m_nextLocalId = 8880000;
-        
        private AssetCache m_assetCache;
        public AssetCache AssetCache
@@ -89,8 +89,8 @@ namespace OpenSim.Region.Environment.Scenes
            get { return m_assetCache; }
            set { m_assetCache = value; }
        }
-        
-        protected RegionStatus m_regStatus;        
+        protected RegionStatus m_regStatus;
        public RegionStatus Region_Status
        {
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Add/Remove Agent/Avatar
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="remoteClient"></param>
        /// <param name="agentID"></param>
@@ -138,7 +138,7 @@ namespace OpenSim.Region.Environment.Scenes
        public abstract void AddNewClient(IClientAPI client, bool child);
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="agentID"></param>
        public abstract void RemoveClient(LLUUID agentID);
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Scenes
        #endregion
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <returns></returns>
        public virtual RegionInfo RegionInfo
@@ -206,7 +206,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        #endregion
-        
        /// <summary>
        /// XXX These two methods are very temporary
        /// </summary>
@@ -217,7 +217,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                return capsPaths[agentId];
            }
-            
            return null;
        }
    }
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 18ce61a..885d1e9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Scenes
                regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing;
                regionCommsHost.OnCloseAgentConnection += CloseConnection;
                regionCommsHost.OnRegionUp += newRegionUp;
-                regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate;                
+                regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate;
            }
            else
            {
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region CommsManager Event handlers
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="regionHandle"></param>
        /// <param name="agent"></param>
@@ -289,7 +289,7 @@ namespace OpenSim.Region.Environment.Scenes
                    agent.child = true;
                    InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
-                    
                    try
                    {
                        d.BeginInvoke(avatar, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint,
@@ -299,20 +299,20 @@ namespace OpenSim.Region.Environment.Scenes
                    catch (Exception e)
                    {
                        m_log.ErrorFormat(
-                            "[REGIONINFO]: Could not resolve external hostname {0} for region {1} ({2}, {3}).  {4}", 
+                            "[REGIONINFO]: Could not resolve external hostname {0} for region {1} ({2}, {3}).  {4}",
-                            neighbours[i].ExternalHostName, 
+                            neighbours[i].ExternalHostName,
-                            neighbours[i].RegionHandle, 
+                            neighbours[i].RegionHandle,
-                            neighbours[i].RegionLocX, 
+                            neighbours[i].RegionLocX,
                            neighbours[i].RegionLocY,
                            e);
-                                                
                        // FIXME: Okay, even though we've failed, we're still going to throw the exception on,
                        // since I don't know what will happen if we just let the client continue
-                        
                        // XXX: Well, decided to swallow the exception instead for now.  Let us see how that goes.
-                        // throw e;                        
+                        // throw e;
-                        
-                    }                    
+                    }
                }
            }
        }
@@ -362,12 +362,12 @@ namespace OpenSim.Region.Environment.Scenes
            {
                m_log.Info("[INTERGRID]: Completed informing neighbors that I'm here");
                handlerRegionUp = OnRegionUp;
-                
                // yes, we're notifying ourselves.
                if (handlerRegionUp != null)
                    handlerRegionUp(region);
-                
            }
            else
            {
@@ -407,9 +407,9 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// This informs all neighboring regions about the settings of it's child agent.
        /// Calls an asynchronous method to do so..  so it doesn't lag the sim.
-        /// 
+        ///
        /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc.
-        /// 
+        ///
        /// </summary>
        private void SendChildAgentDataUpdateAsync(ChildAgentDataUpdate cAgentData, ScenePresence presence)
        {
@@ -468,14 +468,14 @@ namespace OpenSim.Region.Environment.Scenes
                if (regionAccepted)
                {
                    m_log.Info("[INTERGRID]: Completed sending agent Close agent Request to neighbor");
-                    
                }
                else
                {
                    m_log.Info("[INTERGRID]: Failed sending agent Close agent Request to neighbor");
-                    
                }
-                
            }
            // We remove the list of known regions from the agent's known region list through an event
            // to scene, because, if an agent logged of, it's likely that there will be no scene presence
@@ -572,25 +572,25 @@ namespace OpenSim.Region.Environment.Scenes
                    if (destRegionUp)
                    {
                        avatar.Close();
-                        
-                        // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport 
+                        // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport
                        // failure at this point (unlike a border crossing failure).  So perhaps this can never fail
                        // once we reach here...
                        avatar.Scene.RemoveCapsHandler(avatar.UUID);
-                        
                        m_commsProvider.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
                        m_commsProvider.InterRegion.ExpectAvatarCrossing(regionHandle, avatar.ControllingClient.AgentId,
                                                                     position, false);
                        AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo();
-                        
                        // TODO Should construct this behind a method
-                        string capsPath = 
+                        string capsPath =
-                            "http://" + reg.ExternalHostName + ":" + reg.HttpPort 
+                            "http://" + reg.ExternalHostName + ":" + reg.HttpPort
-                            + "/CAPS/" + circuitdata.CapsPath + "0000/";  
+                            + "/CAPS/" + circuitdata.CapsPath + "0000/";
-                        
                        m_log.DebugFormat(
-                            "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID);                        
+                            "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID);
-                        
                        avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4),
                                                                    capsPath);
                        avatar.MakeChildAgent();
@@ -618,7 +618,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="regionhandle"></param>
        /// <param name="agentID"></param>
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index dacd609..7ff9213 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Scenes
        public delegate void DeregisterCapsEvent(LLUUID agentID, Caps caps);
        public event DeregisterCapsEvent OnDeregisterCaps;
-        public class MoneyTransferArgs : EventArgs 
+        public class MoneyTransferArgs : EventArgs
        {
            public LLUUID sender;
            public LLUUID receiver;
@@ -208,7 +208,7 @@ namespace OpenSim.Region.Environment.Scenes
        public class LandBuyArgs : EventArgs
        {
            public LLUUID agentId = LLUUID.Zero;
-            
            public LLUUID groupId = LLUUID.Zero;
            public LLUUID parcelOwnerID = LLUUID.Zero;
@@ -225,9 +225,9 @@ namespace OpenSim.Region.Environment.Scenes
            public int transactionID = 0;
            public int amountDebited = 0;
-            
            public LandBuyArgs(LLUUID pagentId, LLUUID pgroupId, bool pfinal, bool pgroupOwned,
-                bool premoveContribution, int pparcelLocalID, int pparcelArea, int pparcelPrice, 
+                bool premoveContribution, int pparcelLocalID, int pparcelArea, int pparcelPrice,
                bool pauthenticated)
            {
                agentId = pagentId;
@@ -367,7 +367,7 @@ namespace OpenSim.Region.Environment.Scenes
            if (handlerParcelPrimCountUpdate != null)
            {
                handlerParcelPrimCountUpdate();
-            }    
+            }
        }
        public void TriggerMoneyTransfer(Object sender, MoneyTransferArgs e)
@@ -538,7 +538,7 @@ namespace OpenSim.Region.Environment.Scenes
            }
        }
-        public void TriggerOnRegisterCaps(LLUUID agentID, Caps caps) 
+        public void TriggerOnRegisterCaps(LLUUID agentID, Caps caps)
        {
            handlerRegisterCaps = OnRegisterCaps;
            if (handlerRegisterCaps != null)
@@ -547,7 +547,7 @@ namespace OpenSim.Region.Environment.Scenes
            }
        }
-        public void TriggerOnDeregisterCaps(LLUUID agentID, Caps caps) 
+        public void TriggerOnDeregisterCaps(LLUUID agentID, Caps caps)
        {
            handlerDeregisterCaps = OnDeregisterCaps;
            if (handlerDeregisterCaps != null)
@@ -580,7 +580,7 @@ namespace OpenSim.Region.Environment.Scenes
                handlerValidateLandBuy(sender, e);
            }
        }
-        
        public void TriggerAtTargetEvent(uint localID, uint handle, LLVector3 targetpos, LLVector3 currentpos)
        {
            handlerScriptAtTargetEvent = OnScriptAtTargetEvent;
diff --git a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
index 645c302..040ee70 100644
--- a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
@@ -61,19 +61,19 @@ namespace OpenSim.Region.Environment.Scenes
            public uint ExternalChecksGenerateClientFlags(LLUUID userID, LLUUID objectID)
            {
-                                SceneObjectPart part=m_scene.GetSceneObjectPart(objectID);
+                SceneObjectPart part=m_scene.GetSceneObjectPart(objectID);
-                                uint perms=part.GetEffectiveObjectFlags() |
+                uint perms=part.GetEffectiveObjectFlags() |
-                                                (uint)LLObject.ObjectFlags.ObjectModify |
+                        (uint)LLObject.ObjectFlags.ObjectModify |
-                                                (uint)LLObject.ObjectFlags.ObjectCopy |
+                        (uint)LLObject.ObjectFlags.ObjectCopy |
-                                                (uint)LLObject.ObjectFlags.ObjectMove |
+                        (uint)LLObject.ObjectFlags.ObjectMove |
-                                                (uint)LLObject.ObjectFlags.ObjectTransfer |
+                        (uint)LLObject.ObjectFlags.ObjectTransfer |
-                                                (uint)LLObject.ObjectFlags.ObjectYouOwner |
+                        (uint)LLObject.ObjectFlags.ObjectYouOwner |
-                                                (uint)LLObject.ObjectFlags.ObjectYouOfficer;
+                        (uint)LLObject.ObjectFlags.ObjectYouOfficer;
                foreach (GenerateClientFlags check in GenerateClientFlagsCheckFunctions)
                {
-                                        perms &= check(userID, objectID);
+                    perms &= check(userID, objectID);
                }
                return perms;
            }
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 215ab75..8f3de51 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Environment.Scenes
        [Obsolete("TODO: Remove this warning by 0.7")]
        public bool RunTerrainCmdOnCurrentScene(string[] cmdparams, ref string result)
        {
-            m_log.Warn("DEPRECIATED: The terrain engine has been replaced with a new terrain plugin module. Please type 'plugin terrain help' for new commands.");            
+            m_log.Warn("DEPRECIATED: The terrain engine has been replaced with a new terrain plugin module. Please type 'plugin terrain help' for new commands.");
            return false;
        }
@@ -253,7 +253,7 @@ namespace OpenSim.Region.Environment.Scenes
        public bool TrySetCurrentScene(LLUUID regionID)
        {
            Console.WriteLine("Searching for Region: '{0}'", regionID.ToString());
-            
            foreach (Scene scene in m_localScenes)
            {
                if (scene.RegionInfo.RegionID == regionID)
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Scenes
                    return true;
                }
            }
-            
            return false;
        }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 8a7096f..1ac51a6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Environment.Scenes
            if (part != null)
            {
                part.StartScript(itemID);
-               
            }
            else
            {
@@ -58,9 +58,9 @@ namespace OpenSim.Region.Environment.Scenes
                    "[PRIM INVENTORY]: " +
                    "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
                    localID, Name, UUID, itemID);
-            }            
+            }
        }
-        
 //        /// Start a given script.
 //        /// </summary>
 //        /// <param name="localID">
@@ -79,9 +79,9 @@ namespace OpenSim.Region.Environment.Scenes
 //                    "[PRIM INVENTORY]: " +
 //                    "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
 //                    localID, Name, UUID, itemID);
-//            }            
+//            }
-//        }        
+//        }
-        
        /// <summary>
        /// Start the scripts contained in all the prims in this group.
        /// </summary>
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Environment.Scenes
                }
            }
        }
-        
        /// Start a given script.
        /// </summary>
        /// <param name="localID">
@@ -127,11 +127,11 @@ namespace OpenSim.Region.Environment.Scenes
                    "[PRIM INVENTORY]: " +
                    "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}",
                    partID, Name, UUID, itemID);
-            }            
+            }
-        }         
+        }
-        
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="remoteClient"></param>
        /// <param name="localID"></param>
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Scenes
                    localID, Name, UUID);
            }
        }
-         
        /// <summary>
        /// Add an inventory item to a prim in this group.
        /// </summary>
@@ -181,7 +181,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <param name="item"></param>
        /// <param name="copyItemID">The item UUID that should be used by the new item.</param>
        /// <returns></returns>
-        public bool AddInventoryItem(IClientAPI remoteClient, uint localID, 
+        public bool AddInventoryItem(IClientAPI remoteClient, uint localID,
                                     InventoryItemBase item, LLUUID copyItemID)
        {
            LLUUID newItemId = (copyItemID != LLUUID.Zero) ? copyItemID : item.ID;
@@ -190,8 +190,8 @@ namespace OpenSim.Region.Environment.Scenes
            if (part != null)
            {
                TaskInventoryItem taskItem = new TaskInventoryItem();
-                
-                taskItem.ItemID = newItemId;                
+                taskItem.ItemID = newItemId;
                taskItem.AssetID = item.AssetID;
                taskItem.Name = item.Name;
                taskItem.Description = item.Description;
@@ -199,15 +199,15 @@ namespace OpenSim.Region.Environment.Scenes
                taskItem.CreatorID = item.Creator;
                taskItem.Type = item.AssetType;
                taskItem.InvType = item.InvType;
-                
                taskItem.BaseMask = item.BasePermissions;
                taskItem.OwnerMask = item.CurrentPermissions;
                // FIXME: ignoring group permissions for now as they aren't stored in item
                taskItem.EveryoneMask = item.EveryOnePermissions;
                taskItem.NextOwnerMask = item.NextPermissions;
-                    
                part.AddInventoryItem(taskItem);
-                
                return true;
            }
            else
@@ -220,7 +220,7 @@ namespace OpenSim.Region.Environment.Scenes
            return false;
        }
-        
        /// <summary>
        /// Returns an existing inventory item.  Returns the original, so any changes will be live.
        /// </summary>
@@ -240,11 +240,11 @@ namespace OpenSim.Region.Environment.Scenes
                    "[PRIM INVENTORY]: " +
                    "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}",
                    primID, part.Name, part.UUID, itemID);
-            }   
+            }
-            
            return null;
-        }         
+        }
-        
        /// <summary>
        /// Update an existing inventory item.
        /// </summary>
@@ -256,8 +256,8 @@ namespace OpenSim.Region.Environment.Scenes
            SceneObjectPart part = GetChildPart(item.ParentPartID);
            if (part != null)
            {
-                part.UpdateInventoryItem(item);              
+                part.UpdateInventoryItem(item);
-                
                return true;
            }
            else
@@ -266,55 +266,55 @@ namespace OpenSim.Region.Environment.Scenes
                    "[PRIM INVENTORY]: " +
                    "Couldn't find prim ID {0} to update item {1}, {2}",
                    item.ParentPartID, item.Name, item.ItemID);
-            }   
+            }
-            
            return false;
-        }        
+        }
        public int RemoveInventoryItem(uint localID, LLUUID itemID)
        {
            SceneObjectPart part = GetChildPart(localID);
            if (part != null)
-            {                
+            {
                int type = part.RemoveInventoryItem(itemID);
-                
                return type;
            }
-            
            return -1;
-        } 
+        }
-                public uint GetEffectivePermissions()
+        public uint GetEffectivePermissions()
-                {
+        {
-                        uint perms=(uint)(PermissionMask.Modify |
+            uint perms=(uint)(PermissionMask.Modify |
-                                                          PermissionMask.Copy |
+                              PermissionMask.Copy |
-                                                          PermissionMask.Move |
+                              PermissionMask.Move |
-                                                          PermissionMask.Transfer) | 7;
+                              PermissionMask.Transfer) | 7;
-                        foreach (SceneObjectPart part in m_parts.Values)
+            foreach (SceneObjectPart part in m_parts.Values)
-                                perms &= part.MaskEffectivePermissions();
+                perms &= part.MaskEffectivePermissions();
-                        if((RootPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
+            if ((RootPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                                perms &= ~(uint)PermissionMask.Modify;
+                perms &= ~(uint)PermissionMask.Modify;
-                        if((RootPart.OwnerMask & (uint)PermissionMask.Copy) == 0)
+            if ((RootPart.OwnerMask & (uint)PermissionMask.Copy) == 0)
-                                perms &= ~(uint)PermissionMask.Copy;
+                perms &= ~(uint)PermissionMask.Copy;
-                        if((RootPart.OwnerMask & (uint)PermissionMask.Transfer) == 0)
+            if ((RootPart.OwnerMask & (uint)PermissionMask.Transfer) == 0)
-                                perms &= ~(uint)PermissionMask.Transfer;
+                perms &= ~(uint)PermissionMask.Transfer;
-                        if((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Modify) == 0)
+            if ((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Modify) == 0)
-                                perms &= ~((uint)PermissionMask.Modify >> 13);
+                perms &= ~((uint)PermissionMask.Modify >> 13);
-                        if((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Copy) == 0)
+            if ((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Copy) == 0)
-                                perms &= ~((uint)PermissionMask.Copy >> 13);
+                perms &= ~((uint)PermissionMask.Copy >> 13);
-                        if((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Transfer) == 0)
+            if ((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Transfer) == 0)
-                                perms &= ~((uint)PermissionMask.Transfer >> 13);
+                perms &= ~((uint)PermissionMask.Transfer >> 13);
-                        return perms;
+            return perms;
-                }
+        }
-                public void ApplyNextOwnerPermissions()
+        public void ApplyNextOwnerPermissions()
-                {
+        {
-                        foreach (SceneObjectPart part in m_parts.Values)
+            foreach (SceneObjectPart part in m_parts.Values)
-                                part.ApplyNextOwnerPermissions();
+                part.ApplyNextOwnerPermissions();
-                }
+        }
    }
 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 14bfde0..332d160 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -86,11 +86,11 @@ namespace OpenSim.Region.Environment.Scenes
        private PrimCountTaintedDelegate handlerPrimCountTainted = null;
        /// <summary>
-        /// Signal whether the non-inventory attributes of any prims in the group have changed 
+        /// Signal whether the non-inventory attributes of any prims in the group have changed
        /// since the group's last persistent backup
        /// </summary>
        public bool HasGroupChanged = false;
-        
        private LLVector3 lastPhysGroupPos;
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// but not sure a object should have this
        /// as what does it tell us? that some avatar has selected it (but not what Avatar/user)
        /// think really there should be a list (or whatever) in each scenepresence
-        /// saying what prim(s) that user has selected. 
+        /// saying what prim(s) that user has selected.
        /// </summary>
        protected bool m_isSelected = false;
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public int PrimCount
        {
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public LLVector3 GroupCentrePoint
        {
@@ -215,7 +215,7 @@ namespace OpenSim.Region.Environment.Scenes
                        part.GroupPosition = val;
                    }
                }
-                
                //if (m_rootPart.PhysActor != null)
                //{
                //m_rootPart.PhysActor.Position =
@@ -225,7 +225,7 @@ namespace OpenSim.Region.Environment.Scenes
                //}
            }
        }
-        
        public override uint LocalId
        {
            get
@@ -316,17 +316,17 @@ namespace OpenSim.Region.Environment.Scenes
        #region Constructors
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public SceneObjectGroup()
        {
        }
        /// <summary>
-        /// This constructor creates a SceneObjectGroup using a pre-existing SceneObjectPart. 
+        /// This constructor creates a SceneObjectGroup using a pre-existing SceneObjectPart.
-        /// The original SceneObjectPart will be used rather than a copy, preserving 
+        /// The original SceneObjectPart will be used rather than a copy, preserving
        /// its existing localID and UUID.
-        /// </summary>        
+        /// </summary>
        public SceneObjectGroup(Scene scene, ulong regionHandle, SceneObjectPart part)
        {
            m_scene = scene;
@@ -416,7 +416,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public SceneObjectGroup(string xmlData)
        {
@@ -464,7 +464,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public SceneObjectGroup(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos,
                                LLQuaternion rot, PrimitiveBaseShape shape)
@@ -486,7 +486,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public SceneObjectGroup(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos,
                                PrimitiveBaseShape shape)
@@ -576,7 +576,7 @@ namespace OpenSim.Region.Environment.Scenes
                    EntityIntersection inter = part.TestIntersectionOBB(hRay, parentrotation,frontFacesOnly, faceCenters);
-                    // This may need to be updated to the maximum draw distance possible..  
+                    // This may need to be updated to the maximum draw distance possible..
                    // We might (and probably will) be checking for prim creation from other sims
                    // when the camera crosses the border.
                    float idist = Constants.RegionSize;
@@ -676,7 +676,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="part"></param>
        private void SetPartAsRoot(SceneObjectPart part)
@@ -693,7 +693,7 @@ namespace OpenSim.Region.Environment.Scenes
                DetachFromBackup(this);
                m_rootPart.m_attachedAvatar = agentID;
-               
                if (m_rootPart.PhysActor != null)
                {
                    m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor);
@@ -753,7 +753,7 @@ namespace OpenSim.Region.Environment.Scenes
            AttachToBackup();
            m_rootPart.ScheduleFullUpdate();
            m_rootPart.ClearUndoState();
-           
        }
        public void DetachToInventoryPrep()
        {
@@ -764,7 +764,7 @@ namespace OpenSim.Region.Environment.Scenes
                //detachedpos = avatar.AbsolutePosition;
                avatar.RemoveAttachment(this);
            }
-            
            m_rootPart.m_attachedAvatar = LLUUID.Zero;
            m_rootPart.SetParentLocalId(0);
            //m_rootPart.SetAttachmentPoint((byte)0);
@@ -773,10 +773,10 @@ namespace OpenSim.Region.Environment.Scenes
            //m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim);
            //AttachToBackup();
            //m_rootPart.ScheduleFullUpdate();
-            
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="part"></param>
        private void SetPartAsNonRoot(SceneObjectPart part)
@@ -802,7 +802,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// Added as a way for the storage provider to reset the scene, 
+        /// Added as a way for the storage provider to reset the scene,
        /// most likely a better way to do this sort of thing but for now...
        /// </summary>
        /// <param name="scene"></param>
@@ -813,7 +813,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="part"></param>
        public void AddPart(SceneObjectPart part)
@@ -826,7 +826,7 @@ namespace OpenSim.Region.Environment.Scenes
                try
                {
                    m_parts.Add(part.UUID, part);
-                    
                }
                catch (Exception e)
                {
@@ -836,7 +836,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void UpdateParentIDs()
        {
@@ -847,7 +847,7 @@ namespace OpenSim.Region.Environment.Scenes
                    if (part.UUID != m_rootPart.UUID)
                    {
                        part.ParentID = m_rootPart.LocalId;
-                        
                    }
                }
            }
@@ -860,7 +860,7 @@ namespace OpenSim.Region.Environment.Scenes
                foreach (SceneObjectPart part in m_parts.Values)
                {
                    part.UUID = LLUUID.Random();
-                    
                }
            }
        }
@@ -897,7 +897,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                SceneObjectPart part = GetChildPart(localId);
                OnGrabPart(part, offsetPos, remoteClient);
-                
            }
        }
@@ -905,7 +905,7 @@ namespace OpenSim.Region.Environment.Scenes
        {
            part.StoreUndoState();
            part.OnGrab(offsetPos, remoteClient);
-            
        }
        public virtual void OnGrabGroup(LLVector3 offsetPos, IClientAPI remoteClient)
@@ -1068,7 +1068,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Events
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void TriggerTainted()
        {
@@ -1198,7 +1198,7 @@ namespace OpenSim.Region.Environment.Scenes
                dupe.RootPart.DoPhysicsPropertyUpdate(dupe.RootPart.PhysActor.IsPhysical, true);
            }
-            // Now we've made a copy that replaces this one, we need to 
+            // Now we've made a copy that replaces this one, we need to
            // switch the owner to the person who did the copying
            // Second Life copies an object and duplicates the first one in it's place
            // So, we have to make a copy of this one, set it in it's place then set the owner on this one
@@ -1227,7 +1227,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="part"></param>
        /// <param name="cAgentID"></param>
@@ -1359,7 +1359,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="part"></param>
        /// <param name="cAgentID"></param>
@@ -1373,14 +1373,14 @@ namespace OpenSim.Region.Environment.Scenes
            {
                m_parts.Add(newPart.UUID, newPart);
            }
-            
            SetPartAsNonRoot(newPart);
-            
        }
        /// <summary>
        /// Reset the LLUUIDs for all the prims that make up this group.
-        /// 
+        ///
        /// This is called by methods which want to add a new group to an existing scene, in order
        /// to ensure that there are no clashes with groups already present.
        /// </summary>
@@ -1398,7 +1398,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="part"></param>
        public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, LLUUID AgentID, uint RequestFlags)
@@ -1425,7 +1425,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// </summary>
        public override void Update()
        {
-            
            lock (m_parts)
            {
                //if (m_rootPart.m_IsAttachment)
@@ -1436,7 +1436,7 @@ namespace OpenSim.Region.Environment.Scenes
                    //}
                    //return;
                //}
-            
                if (Util.GetDistanceTo(lastPhysGroupPos, AbsolutePosition) > 0.02)
                {
                    m_rootPart.UpdateFlag = 1;
@@ -1447,10 +1447,10 @@ namespace OpenSim.Region.Environment.Scenes
                        //if (part.UpdateFlag == 0) part.UpdateFlag = 1;
                    //}
-                    
-                    
                    checkAtTargets();
-                
                if ((Math.Abs(lastPhysGroupRot.W - GroupRotation.W) > 0.1)
                    || (Math.Abs(lastPhysGroupRot.X - GroupRotation.X) > 0.1)
@@ -1508,7 +1508,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void ScheduleGroupForTerseUpdate()
        {
@@ -1524,7 +1524,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void SendGroupFullUpdate()
        {
@@ -1545,7 +1545,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void SendGroupTerseUpdate()
        {
@@ -1669,7 +1669,7 @@ namespace OpenSim.Region.Environment.Scenes
        {
            if (objectGroup.RootPart.UpdateFlag > 0)
            {
-                // I've never actually seen this happen, though I think it's theoretically possible                
+                // I've never actually seen this happen, though I think it's theoretically possible
                m_log.WarnFormat(
                    "[SCENE OBJECT GROUP]: Aborted linking {0}, {1} to {2}, {3} as it has yet to finish delinking",
                    objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID);
@@ -1678,7 +1678,7 @@ namespace OpenSim.Region.Environment.Scenes
            }
 //            m_log.DebugFormat(
-//                "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}", 
+//                "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}",
 //                objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID);
            SceneObjectPart linkPart = objectGroup.m_rootPart;
@@ -1747,19 +1747,19 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// Delink the given prim from this group.  The delinked prim is established as 
+        /// Delink the given prim from this group.  The delinked prim is established as
        /// an independent SceneObjectGroup.
        /// </summary>
        /// <param name="partID"></param>
        public void DelinkFromGroup(uint partID)
        {
            SceneObjectPart linkPart = GetChildPart(partID);
-            
            if (null != linkPart)
            {
                linkPart.ClearUndoState();
 //                m_log.DebugFormat(
-//                    "[SCENE OBJECT GROUP]: Delinking part {0}, {1} from group with root part {2}, {3}", 
+//                    "[SCENE OBJECT GROUP]: Delinking part {0}, {1} from group with root part {2}, {3}",
 //                    linkPart.Name, linkPart.UUID, RootPart.Name, RootPart.UUID);
                LLQuaternion worldRot = linkPart.GetWorldRotation();
@@ -1777,8 +1777,8 @@ namespace OpenSim.Region.Environment.Scenes
                    m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor);
                }
-                // We need to reset the child part's position 
+                // We need to reset the child part's position
-                // ready for life as a separate object after being a part of another object                                                
+                // ready for life as a separate object after being a part of another object
                Quaternion parentRot
                    = new Quaternion(
                        m_rootPart.RotationOffset.W,
@@ -1933,7 +1933,7 @@ namespace OpenSim.Region.Environment.Scenes
                                               m_rootPart.TouchName, new byte[0], m_rootPart.SitName, m_rootPart.Name, m_rootPart.Description,
                                               m_rootPart.OwnerMask, m_rootPart.NextOwnerMask, m_rootPart.GroupMask, m_rootPart.EveryoneMask,
                                               m_rootPart.BaseMask);
-            
        }
        /// <summary>
@@ -1998,13 +1998,13 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <param name="type"></param>
        /// <param name="inUse"></param>
        /// <param name="data"></param>
-        /// 
+        ///
        public void UpdatePrimFlags(uint localID, ushort type, bool inUse, byte[] data)
        {
            SceneObjectPart part = GetChildPart(localID);
@@ -2046,7 +2046,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="localID"></param>
        /// <param name="textureEntry"></param>
@@ -2071,7 +2071,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Shape
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="shapeBlock"></param>
        public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock, uint localID)
@@ -2091,7 +2091,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Resize
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="scale"></param>
        /// <param name="localID"></param>
@@ -2169,7 +2169,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Position
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="pos"></param>
        public void UpdateGroupPosition(LLVector3 pos)
@@ -2189,7 +2189,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="pos"></param>
        /// <param name="localID"></param>
@@ -2210,7 +2210,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="pos"></param>
        private void UpdateRootPosition(LLVector3 pos)
@@ -2255,7 +2255,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Rotation
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="rot"></param>
        public void UpdateGroupRotation(LLQuaternion rot)
@@ -2272,7 +2272,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="pos"></param>
        /// <param name="rot"></param>
@@ -2291,7 +2291,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="rot"></param>
        /// <param name="localID"></param>
@@ -2312,7 +2312,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="rot"></param>
        private void UpdateRootRotation(LLQuaternion rot)
@@ -2463,7 +2463,7 @@ namespace OpenSim.Region.Environment.Scenes
                                // Reusing att.tolerance to hold the index of the target in the targets dictionary
                                // to avoid deadlocking the sim.
                                m_scene.TriggerAtTargetEvent(localids[ctr], (uint)att.tolerance, att.targetPos, m_rootPart.GroupPosition);
-                                
                            }
                        }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index e1be8ff..cce263c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// Holds in memory prim inventory
-        /// </summary> 
+        /// </summary>
        protected TaskInventoryDictionary m_taskInventory = new TaskInventoryDictionary();
        public TaskInventoryDictionary TaskInventory
@@ -84,21 +84,21 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// Reset LLUUIDs for all the items in the prim's inventory.  This involves either generating
        /// new ones or setting existing UUIDs to the correct parent UUIDs.
-        /// 
+        ///
        /// If this method is called and there are inventory items, then we regard the inventory as having changed.
        /// </summary>
        /// <param name="linkNum">Link number for the part</param>
        public void ResetInventoryIDs()
        {
            lock (TaskInventory)
-            {                         
+            {
                if (0 == TaskInventory.Count)
                {
-                    return;                    
+                    return;
                }
-                
-                HasInventoryChanged = true;                
+                HasInventoryChanged = true;
-                
                IList<TaskInventoryItem> items = new List<TaskInventoryItem>(TaskInventory.Values);
                TaskInventory.Clear();
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Environment.Scenes
                    if (ownerId != item.OwnerID)
                    {
                        item.LastOwnerID = item.OwnerID;
-                        item.OwnerID = ownerId; 
+                        item.OwnerID = ownerId;
                    }
                }
            }
@@ -178,7 +178,7 @@ namespace OpenSim.Region.Environment.Scenes
        {
            //            m_log.InfoFormat(
            //                "[PRIM INVENTORY]: " +
-            //                "Starting script {0}, {1} in prim {2}, {3}", 
+            //                "Starting script {0}, {1} in prim {2}, {3}",
            //                item.Name, item.ItemID, Name, UUID);
            AddFlag(LLObject.ObjectFlags.Scripted);
@@ -211,7 +211,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// </summary>
        /// <param name="itemId">
        /// A <see cref="LLUUID"/>
-        /// </param>        
+        /// </param>
        public void StartScript(LLUUID itemId)
        {
            lock (m_taskInventory)
@@ -234,7 +234,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// Stop a script which is in this prim's inventory.
        /// </summary>
-        /// <param name="itemId"></param>        
+        /// <param name="itemId"></param>
        public void StopScript(LLUUID itemId)
        {
            if (m_taskInventory.ContainsKey(itemId))
@@ -306,9 +306,9 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// Restore a whole collection of items to the prim's inventory at once.  
+        /// Restore a whole collection of items to the prim's inventory at once.
        /// We assume that the items already have all their fields correctly filled out.
-        /// The items are not flagged for persistence to the database, since they are being restored 
+        /// The items are not flagged for persistence to the database, since they are being restored
        /// from persistence rather than being newly added.
        /// </summary>
        /// <param name="items"></param>
@@ -338,9 +338,9 @@ namespace OpenSim.Region.Environment.Scenes
                if (m_taskInventory.ContainsKey(itemID))
                {
 //                    m_log.DebugFormat(
-//                        "[PRIM INVENTORY]: Retrieved task inventory item {0}, {1} from prim {2}, {3}", 
+//                        "[PRIM INVENTORY]: Retrieved task inventory item {0}, {1} from prim {2}, {3}",
 //                        m_taskInventory[itemID].Name, itemID, Name, UUID);
-                    
                    return m_taskInventory[itemID];
                }
                else
@@ -450,11 +450,11 @@ namespace OpenSim.Region.Environment.Scenes
        /// <param name="client"></param>
        /// <param name="localID"></param>
        public bool GetInventoryFileName(IClientAPI client, uint localID)
-        {                        
+        {
 //            m_log.DebugFormat(
 //                 "[PRIM INVENTORY]: Received request from client {0} for inventory file name of {1}, {2}",
 //                 client.AgentId, Name, UUID);
-            
            if (m_inventorySerial > 0)
            {
                client.SendTaskInventory(m_uuid, (short)m_inventorySerial,
@@ -473,9 +473,9 @@ namespace OpenSim.Region.Environment.Scenes
        /// </summary>
        /// <param name="xferManager"></param>
        public void RequestInventoryFile(IXfer xferManager)
-        {            
+        {
            byte[] fileData = new byte[0];
-            
            // Confusingly, the folder item has to be the object id, while the 'parent id' has to be zero.  This matches
            // what appears to happen in the Second Life protocol.  If this isn't the case. then various functionality
            // isn't available (such as drag from prim inventory to agent inventory)
@@ -486,39 +486,39 @@ namespace OpenSim.Region.Environment.Scenes
                foreach (TaskInventoryItem item in m_taskInventory.Values)
                {
                    invString.AddItemStart();
-                    invString.AddNameValueLine("item_id", item.ItemID.ToString());                    
+                    invString.AddNameValueLine("item_id", item.ItemID.ToString());
                    invString.AddNameValueLine("parent_id", UUID.ToString());
                    invString.AddPermissionsStart();
-                    
-                                        invString.AddNameValueLine("base_mask", Helpers.UIntToHexString(item.BaseMask));
+                    invString.AddNameValueLine("base_mask", Helpers.UIntToHexString(item.BaseMask));
-                                        invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(item.OwnerMask));
+                    invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(item.OwnerMask));
                    invString.AddNameValueLine("group_mask", "00000000");
                    invString.AddNameValueLine("everyone_mask", "00000000");
                    invString.AddNameValueLine("next_owner_mask", Helpers.UIntToHexString(item.NextOwnerMask));
-                    
                    invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
                    invString.AddNameValueLine("owner_id", item.OwnerID.ToString());
-                    
                    invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
 //                    invString.AddNameValueLine("last_owner_id", item.OwnerID.ToString());
-                    
                    invString.AddNameValueLine("group_id", item.GroupID.ToString());
                    invString.AddSectionEnd();
-                        
                    invString.AddNameValueLine("asset_id", item.AssetID.ToString());
                    invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
                    invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
                    invString.AddNameValueLine("flags", "00000000");
-                                        
                    invString.AddSaleStart();
                    invString.AddNameValueLine("sale_type", "not");
                    invString.AddNameValueLine("sale_price", "0");
                    invString.AddSectionEnd();
-                    
                    invString.AddNameValueLine("name", item.Name + "|");
                    invString.AddNameValueLine("desc", item.Description + "|");
-                                    
                    invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
                    invString.AddSectionEnd();
                }
@@ -576,13 +576,13 @@ namespace OpenSim.Region.Environment.Scenes
                BuildString += "\tpermissions 0\n";
                AddSectionStart();
            }
-            
            public void AddSaleStart()
            {
                BuildString += "\tsale_info\t0\n";
                AddSectionStart();
-            }            
+            }
-            
            protected void AddSectionStart()
            {
                BuildString += "\t{\n";
@@ -610,64 +610,64 @@ namespace OpenSim.Region.Environment.Scenes
            }
        }
-                public uint MaskEffectivePermissions()
+        public uint MaskEffectivePermissions()
-                {
+        {
-                        uint mask=0x7fffffff;
+            uint mask=0x7fffffff;
-                        foreach (TaskInventoryItem item in m_taskInventory.Values)
+            foreach (TaskInventoryItem item in m_taskInventory.Values)
-                        {
+            {
-                                if(item.InvType != 6)
+                if (item.InvType != 6)
-                                {
+                {
-                                        if((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Copy) == 0)
+                    if ((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Copy) == 0)
-                                                mask &= ~((uint)PermissionMask.Copy >> 13);
+                        mask &= ~((uint)PermissionMask.Copy >> 13);
-                                        if((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Transfer) == 0)
+                    if ((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Transfer) == 0)
-                                                mask &= ~((uint)PermissionMask.Transfer >> 13);
+                        mask &= ~((uint)PermissionMask.Transfer >> 13);
-                                        if((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Modify) == 0)
+                    if ((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Modify) == 0)
-                                                mask &= ~((uint)PermissionMask.Modify >> 13);
+                        mask &= ~((uint)PermissionMask.Modify >> 13);
-                                }
+                }
-                                else
+                else
-                                {
+                {
-                                        if((item.OwnerMask & ((uint)PermissionMask.Copy >> 13)) == 0)
+                    if ((item.OwnerMask & ((uint)PermissionMask.Copy >> 13)) == 0)
-                                                mask &= ~((uint)PermissionMask.Copy >> 13);
+                        mask &= ~((uint)PermissionMask.Copy >> 13);
-                                        if((item.OwnerMask & ((uint)PermissionMask.Transfer >> 13)) == 0)
+                    if ((item.OwnerMask & ((uint)PermissionMask.Transfer >> 13)) == 0)
-                                                mask &= ~((uint)PermissionMask.Transfer >> 13);
+                        mask &= ~((uint)PermissionMask.Transfer >> 13);
-                                        if((item.OwnerMask & ((uint)PermissionMask.Modify >> 13)) == 0)
+                    if ((item.OwnerMask & ((uint)PermissionMask.Modify >> 13)) == 0)
-                                                mask &= ~((uint)PermissionMask.Modify >> 13);
+                        mask &= ~((uint)PermissionMask.Modify >> 13);
-                                }
+                }
-                                if((item.OwnerMask & (uint)PermissionMask.Copy) == 0)
+                if ((item.OwnerMask & (uint)PermissionMask.Copy) == 0)
-                                        mask &= ~(uint)PermissionMask.Copy;
+                    mask &= ~(uint)PermissionMask.Copy;
-                                if((item.OwnerMask & (uint)PermissionMask.Transfer) == 0)
+                if ((item.OwnerMask & (uint)PermissionMask.Transfer) == 0)
-                                        mask &= ~(uint)PermissionMask.Transfer;
+                    mask &= ~(uint)PermissionMask.Transfer;
-                                if((item.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                if ((item.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                                        mask &= ~(uint)PermissionMask.Modify;
+                    mask &= ~(uint)PermissionMask.Modify;
-                        }
+            }
-                        return mask;
+            return mask;
-                }
+        }
-                public void ApplyNextOwnerPermissions()
+        public void ApplyNextOwnerPermissions()
-                {
+        {
-                        BaseMask &= NextOwnerMask;
+            BaseMask &= NextOwnerMask;
-                        OwnerMask &= NextOwnerMask;
+            OwnerMask &= NextOwnerMask;
-                        EveryoneMask &= NextOwnerMask;
+            EveryoneMask &= NextOwnerMask;
-                        foreach (TaskInventoryItem item in m_taskInventory.Values)
+            foreach (TaskInventoryItem item in m_taskInventory.Values)
-                        {
+            {
-                                if(item.InvType == 6)
+                if (item.InvType == 6)
-                                {
+                {
-                                        if((item.OwnerMask & ((uint)PermissionMask.Copy >> 13)) == 0)
+                    if ((item.OwnerMask & ((uint)PermissionMask.Copy >> 13)) == 0)
-                                                item.OwnerMask &= ~(uint)PermissionMask.Copy;
+                        item.OwnerMask &= ~(uint)PermissionMask.Copy;
-                                        if((item.OwnerMask & ((uint)PermissionMask.Transfer >> 13)) == 0)
+                    if ((item.OwnerMask & ((uint)PermissionMask.Transfer >> 13)) == 0)
-                                                item.OwnerMask &= ~(uint)PermissionMask.Transfer;
+                        item.OwnerMask &= ~(uint)PermissionMask.Transfer;
-                                        if((item.OwnerMask & ((uint)PermissionMask.Modify >> 13)) == 0)
+                    if ((item.OwnerMask & ((uint)PermissionMask.Modify >> 13)) == 0)
-                                                item.OwnerMask &= ~(uint)PermissionMask.Modify;
+                        item.OwnerMask &= ~(uint)PermissionMask.Modify;
-                                }
+                }
-                                item.OwnerMask &= item.NextOwnerMask;
+                item.OwnerMask &= item.NextOwnerMask;
-                                item.BaseMask &= item.NextOwnerMask;
+                item.BaseMask &= item.NextOwnerMask;
-                                item.EveryoneMask &= item.NextOwnerMask;
+                item.EveryoneMask &= item.NextOwnerMask;
-                        }
+            }
-                        TriggerScriptChangedEvent(Changed.OWNER);
+            TriggerScriptChangedEvent(Changed.OWNER);
-                }
+        }
    }
 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 0196b91..a52d5f9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -41,7 +41,7 @@ using OpenSim.Region.Physics.Manager;
 namespace OpenSim.Region.Environment.Scenes
 {
-    // I don't really know where to put this except here.  
+    // I don't really know where to put this except here.
    // Can't access the OpenSim.Region.ScriptEngine.Common.LSL_BaseClass.Changed constants
    [Flags]
    public enum ExtraParamType
@@ -81,13 +81,13 @@ namespace OpenSim.Region.Environment.Scenes
        SCALE = 0x40
    }
-    
    [Serializable]
    public partial class SceneObjectPart : IScriptHost, ISerializable
    {
        [XmlIgnore] public PhysicsActor PhysActor = null;
-        
        public LLUUID LastOwnerID;
        public LLUUID OwnerID;
        public LLUUID GroupID;
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Environment.Scenes
        public byte ObjectSaleType;
        public int SalePrice;
        public uint Category;
-        
        // TODO: This needs to be persisted in next XML version update!
        [XmlIgnore] public int[] PayPrice = {-2,-2,-2,-2,-2};
        [XmlIgnore] private Dictionary<LLUUID, scriptEvents> m_scriptEvents = new Dictionary<LLUUID, scriptEvents>();
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Environment.Scenes
            set { Flags = (LLObject.ObjectFlags)value; }
        }
-        #endregion  
+        #endregion
        protected byte[] m_particleSystem = new byte[0];
@@ -152,13 +152,13 @@ namespace OpenSim.Region.Environment.Scenes
        /// 0 - no update is scheduled
        /// 1 - terse update scheduled
        /// 2 - full update scheduled
-        /// 
+        ///
        /// TODO - This should be an enumeration
        /// </summary>
        private byte m_updateFlag;
        #region Properties
-        
        public LLUUID CreatorID;
        public LLUUID ObjectCreator
@@ -230,7 +230,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <returns>A Linked Child Prim objects position in world</returns>
        public LLVector3 GetWorldPosition()
        {
-            
            Quaternion parentRot = new Quaternion(
            ParentGroup.RootPart.RotationOffset.W,
            ParentGroup.RootPart.RotationOffset.X,
@@ -256,13 +256,13 @@ namespace OpenSim.Region.Environment.Scenes
        /// <returns></returns>
        public LLQuaternion GetWorldRotation()
        {
-            
            Quaternion newRot;
-            
            if (this.LinkNum == 0)
            {
                newRot = new Quaternion(RotationOffset.W,RotationOffset.X,RotationOffset.Y,RotationOffset.Z);
-               
            }
            else
            {
@@ -286,7 +286,7 @@ namespace OpenSim.Region.Environment.Scenes
            //return new LLQuaternion(axiomPartRotation.x, axiomPartRotation.y, axiomPartRotation.z, axiomPartRotation.w);
        }
-        
        public void StoreUndoState()
        {
            if (!m_undoing)
@@ -307,7 +307,7 @@ namespace OpenSim.Region.Environment.Scenes
                    if (m_parentGroup.GetSceneMaxUndo() > 0)
                    {
                        UndoState nUndo = new UndoState(this);
-                        
                        m_undo.Push(nUndo);
                    }
@@ -362,7 +362,7 @@ namespace OpenSim.Region.Environment.Scenes
                        }
                        else
                        {
-                            
                            // To move the child prim in respect to the group position and rotation we have to calculate
                            LLVector3 resultingposition = GetWorldPosition();
@@ -370,7 +370,7 @@ namespace OpenSim.Region.Environment.Scenes
                            LLQuaternion resultingrot = GetWorldRotation();
                            PhysActor.Orientation = new Quaternion(resultingrot.W, resultingrot.X, resultingrot.Y, resultingrot.Z);
                        }
-                        
                        // Tell the physics engines that this prim changed.
                        m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
                    }
@@ -379,12 +379,12 @@ namespace OpenSim.Region.Environment.Scenes
                        Console.WriteLine(e.Message);
                    }
                }
-               
            }
        }
        private byte[] m_TextureAnimation;
-        
        protected LLVector3 m_offsetPosition;
        public LLVector3 OffsetPosition
@@ -398,7 +398,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                // Hack to get the child prim to update world positions in the physics engine
                ParentGroup.ResetChildPrimPhysicsPositions();
-                
            }
            catch (NullReferenceException)
            {
@@ -467,7 +467,7 @@ namespace OpenSim.Region.Environment.Scenes
                        Console.WriteLine(ex.Message);
                    }
                }
-                
            }
        }
@@ -494,8 +494,8 @@ namespace OpenSim.Region.Environment.Scenes
                return m_velocity;
            }
-            set { 
+            set {
-                
                m_velocity = value;
                if (PhysActor != null)
                {
@@ -505,7 +505,7 @@ namespace OpenSim.Region.Environment.Scenes
                        m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
                    }
                }
-              
            }
        }
@@ -565,7 +565,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                m_color = value;
                TriggerScriptChangedEvent(Changed.COLOR);
-                
                /* ScheduleFullUpdate() need not be called b/c after
                 * setting the color, the text will be set, so then
                 * ScheduleFullUpdate() will be called. */
@@ -615,11 +615,11 @@ namespace OpenSim.Region.Environment.Scenes
        public int LinkNum
        {
            get { return m_linkNum; }
-            set 
+            set
-            { 
+            {
                m_linkNum = value;
                TriggerScriptChangedEvent(Changed.LINK);
-                
            }
        }
@@ -646,7 +646,7 @@ namespace OpenSim.Region.Environment.Scenes
        public void ApplyImpulse(LLVector3 impulsei, bool localGlobalTF)
        {
            PhysicsVector impulse = new PhysicsVector(impulsei.X, impulsei.Y, impulsei.Z);
-            
            if (localGlobalTF)
            {
@@ -659,7 +659,7 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                
                if (m_parentGroup != null)
                {
                    m_parentGroup.applyImpulse(impulse);
@@ -698,9 +698,9 @@ namespace OpenSim.Region.Environment.Scenes
        public PrimitiveBaseShape Shape
        {
            get { return m_shape; }
-            set 
+            set
            {
-                
                m_shape = value;
                TriggerScriptChangedEvent(Changed.SHAPE);
            }
@@ -709,7 +709,7 @@ namespace OpenSim.Region.Environment.Scenes
        public LLVector3 Scale
        {
            get { return m_shape.Scale; }
-            set 
+            set
            {
                StoreUndoState();
                m_shape.Scale = value;
@@ -731,7 +731,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        #endregion
-         
        public LLUUID ObjectOwner
        {
            get { return OwnerID; }
@@ -809,9 +809,9 @@ namespace OpenSim.Region.Environment.Scenes
            Acceleration = new LLVector3(0, 0, 0);
            m_TextureAnimation = new byte[0];
            m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp";
-            
            // Prims currently only contain a single folder (Contents).  From looking at the Second Life protocol,
-            // this appears to have the same UUID (!) as the prim.  If this isn't the case, one can't drag items from 
+            // this appears to have the same UUID (!) as the prim.  If this isn't the case, one can't drag items from
            // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log
            Flags = 0;
@@ -819,7 +819,7 @@ namespace OpenSim.Region.Environment.Scenes
            TrimPermissions();
            //m_undo = new UndoStack<UndoState>(ParentGroup.GetSceneMaxUndo());
-            
            ScheduleFullUpdate();
        }
@@ -855,14 +855,14 @@ namespace OpenSim.Region.Environment.Scenes
            OffsetPosition = position;
            RotationOffset = rotation;
            ObjectFlags = flags;
-            
            // Since we don't store script state, this is only a 'temporary' objectflag now
            // If the object is scripted, the script will get loaded and this will be set again
-            ObjectFlags &= ~(uint)(LLObject.ObjectFlags.Scripted | LLObject.ObjectFlags.Touch); 
+            ObjectFlags &= ~(uint)(LLObject.ObjectFlags.Scripted | LLObject.ObjectFlags.Touch);
-            
            TrimPermissions();
            // ApplyPhysics();
-           
            ScheduleFullUpdate();
        }
@@ -881,7 +881,7 @@ namespace OpenSim.Region.Environment.Scenes
            SceneObjectPart newobject = (SceneObjectPart) serializer.Deserialize(xmlReader);
            return newobject;
        }
-         
        public void ApplyPhysics(uint rootObjectFlags, bool m_physicalPrim)
        {
@@ -902,7 +902,7 @@ namespace OpenSim.Region.Environment.Scenes
                    new PhysicsVector(Scale.X, Scale.Y, Scale.Z),
                    new Quaternion(RotationOffset.W, RotationOffset.X,
                                   RotationOffset.Y, RotationOffset.Z), RigidBody);
-                
                // Basic Physics returns null..  joy joy joy.
                if (PhysActor != null)
                {
@@ -954,7 +954,7 @@ namespace OpenSim.Region.Environment.Scenes
            Vector3 rOrigin = iray.Origin;
            Vector3 rDirection = iray.Direction;
-            
            //rDirection = rDirection.Normalize();
            // Buidling the first part of the Quadratic equation
@@ -985,7 +985,7 @@ namespace OpenSim.Region.Environment.Scenes
                radius = vScale.z;
            // the second part of this is the default prim size
-            // once we factor in the aabb of the prim we're adding we can 
+            // once we factor in the aabb of the prim we're adding we can
            // change this to;
            // radius = (radius / 2) - 0.01f;
            //
@@ -1018,7 +1018,7 @@ namespace OpenSim.Region.Environment.Scenes
                }
            }
-            // We got an intersection.  putting together an EntityIntersection object with the 
+            // We got an intersection.  putting together an EntityIntersection object with the
            // intersection information
            Vector3 ipoint =
                new Vector3(iray.Origin.x + (iray.Direction.x*root), iray.Origin.y + (iray.Direction.y*root),
@@ -1089,16 +1089,16 @@ namespace OpenSim.Region.Environment.Scenes
            Vector3 AXpos = new Vector3(pos.X, pos.Y, pos.Z);
            // tScale is the offset to derive the vertex based on the scale.
-            // it's different for each vertex because we've got to rotate it 
+            // it's different for each vertex because we've got to rotate it
            // to get the world position of the vertex to produce the Oriented Bounding Box
-            Vector3 tScale = new Vector3(); 
+            Vector3 tScale = new Vector3();
            Vector3 AXscale = new Vector3(m_shape.Scale.X * 0.5f, m_shape.Scale.Y * 0.5f, m_shape.Scale.Z * 0.5f);
            //Vector3 pScale = (AXscale) - (AXrot.Inverse() * (AXscale));
            //Vector3 nScale = (AXscale * -1) - (AXrot.Inverse() * (AXscale * -1));
-            
            // rScale is the rotated offset to find a vertex based on the scale and the world rotation.
            Vector3 rScale = new Vector3();
@@ -1109,14 +1109,14 @@ namespace OpenSim.Region.Environment.Scenes
            //                    |         |
            //                    |  4 top  |
            //                    |_________|
-            //                   C           D  
+            //                   C           D
-            
            //                   A _________ B
            //                    |  Back   |
            //                    |    3    |
            //                    |_________|
-            //                   C           D   
+            //                   C           D
-        
            //   A _________ B                     B _________ A
            //    |  Left   |                       |  Right  |
            //    |    0    |                       |    2    |
@@ -1127,13 +1127,13 @@ namespace OpenSim.Region.Environment.Scenes
            //                    |  Front  |
            //                    |    1    |
            //                    |_________|
-            //                   C           D           
+            //                   C           D
            //                   C _________ D
            //                    |         |
            //                    |  5 bot  |
            //                    |_________|
-            //                   A           B   
+            //                   A           B
            #endregion
            #region Plane Decomposition of Oriented Bounding Box
@@ -1238,22 +1238,22 @@ namespace OpenSim.Region.Environment.Scenes
            for (int i = 0; i < 6; i++)
            {
                //m_log.Info("[FACECALCULATION]: FaceA[" + i + "]=" + FaceA[i] + " FaceB[" + i + "]=" + FaceB[i] + " FaceC[" + i + "]=" + FaceC[i] + " FaceD[" + i + "]=" + FaceD[i]);
-                
                // Our Plane direction
                AmBa = FaceA[i] - FaceB[i];
                AmBb = FaceB[i] - FaceC[i];
-                
                cross = AmBb.Cross(AmBa);
                // normalize the cross product to get the normal.
-                normals[i] = cross / cross.Length; 
+                normals[i] = cross / cross.Length;
-                
                //m_log.Info("[NORMALS]: normals[ " + i + "]" + normals[i].ToString());
                //distance[i] = (normals[i].x * AmBa.x + normals[i].y * AmBa.y + normals[i].z * AmBa.z) * -1;
            }
            EntityIntersection returnresult = new EntityIntersection();
-            
            returnresult.distance = 1024;
            float c = 0;
            float a = 0;
@@ -1276,7 +1276,7 @@ namespace OpenSim.Region.Environment.Scenes
                    //{
                        //return returnresult;
                    //}
-                   // else 
+                   // else
                    //{
                        //continue;
                    //}
@@ -1294,9 +1294,9 @@ namespace OpenSim.Region.Environment.Scenes
                    //}
                //}
-                //else 
+                //else
                //{
-                    //if (a < fmin) 
+                    //if (a < fmin)
                    //{
                        //if (a < 0 || a < fmax)
                        //{
@@ -1339,7 +1339,7 @@ namespace OpenSim.Region.Environment.Scenes
                // If the normal is pointing outside the object
-                
                if (iray.Direction.Dot(normals[i]) < 0 || !frontFacesOnly)
                {
@@ -1359,7 +1359,7 @@ namespace OpenSim.Region.Environment.Scenes
                    {
                        distance2 = (float)GetDistanceTo(q, iray.Origin);
                    }
-                    
                    if (distance2 < returnresult.distance)
                    {
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Environment.Scenes
            }
            return returnresult;
        }
-        
        // Use this for attachments!  LocalID should be avatar's localid
        public void SetParentLocalId(uint localID)
        {
@@ -1388,16 +1388,16 @@ namespace OpenSim.Region.Environment.Scenes
        public void SetAttachmentPoint(uint AttachmentPoint)
        {
            m_attachmentPoint = AttachmentPoint;
-            
            // save the attachment point.
            //if (AttachmentPoint != 0)
            //{
                m_shape.State = (byte)AttachmentPoint;
            //}
-           
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void SetParent(SceneObjectGroup parent)
        {
@@ -1417,7 +1417,7 @@ namespace OpenSim.Region.Environment.Scenes
                PhysActor.Buoyancy = fvalue;
            }
        }
-        
        public void SetAxisRotation(int axis, int rotate)
        {
            if (m_parentGroup != null)
@@ -1448,7 +1448,7 @@ namespace OpenSim.Region.Environment.Scenes
            }
        }
-        
        public LLVector3 GetSitTargetPositionLL()
        {
@@ -1547,9 +1547,9 @@ namespace OpenSim.Region.Environment.Scenes
            dupe.ObjectSaleType = ObjectSaleType;
            dupe.SalePrice = SalePrice;
            dupe.Category = Category;
-            
            dupe.TaskInventory = (TaskInventoryDictionary)dupe.TaskInventory.Clone();
-            
            dupe.ResetIDs(linkNum);
            // This may be wrong...    it might have to be applied in SceneObjectGroup to the object that's being duplicated.
@@ -1569,7 +1569,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        #endregion
-        
        /// <summary>
        /// Reset LLUUIDs for this part.  This involves generate this part's own LLUUID and
        /// generating new LLUUIDs for all the items in the inventory.
@@ -1578,8 +1578,8 @@ namespace OpenSim.Region.Environment.Scenes
        public void ResetIDs(int linkNum)
        {
            UUID = LLUUID.Random();
-            LinkNum = linkNum;      
+            LinkNum = linkNum;
-            
            ResetInventoryIDs();
        }
@@ -1603,9 +1603,9 @@ namespace OpenSim.Region.Environment.Scenes
                m_parentGroup.HasGroupChanged = true;
                m_parentGroup.QueueForUpdateCheck();
            }
-            
            int timeNow = Util.UnixTimeSinceEpoch();
-                        
            // If multiple updates are scheduled on the same second, we still need to perform all of them
            // So we'll force the issue by bumping up the timestamp so that later processing sees these need
            // to be performed.
@@ -1617,11 +1617,11 @@ namespace OpenSim.Region.Environment.Scenes
            {
                TimeStampFull = (uint)timeNow;
            }
-            
            m_updateFlag = 2;
-            
 //            m_log.DebugFormat(
-//                "[SCENE OBJECT PART]: Scheduling full  update for {0}, {1} at {2}", 
+//                "[SCENE OBJECT PART]: Scheduling full  update for {0}, {1} at {2}",
 //                UUID, Name, TimeStampFull);
        }
@@ -1668,13 +1668,13 @@ namespace OpenSim.Region.Environment.Scenes
                m_updateFlag = 1;
 //                m_log.DebugFormat(
-//                    "[SCENE OBJECT PART]: Scheduling terse update for {0}, {1} at {2}", 
+//                    "[SCENE OBJECT PART]: Scheduling terse update for {0}, {1} at {2}",
 //                    UUID, Name, TimeStampTerse);
            }
        }
        /// <summary>
-        /// Tell all the prims which have had updates scheduled 
+        /// Tell all the prims which have had updates scheduled
        /// </summary>
        public void SendScheduledUpdates()
        {
@@ -1687,7 +1687,7 @@ namespace OpenSim.Region.Environment.Scenes
                // bad, so it's been replaced by an event driven method.
                //if ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) != 0)
                //{
-                // Only send the constant terse updates on physical objects!   
+                // Only send the constant terse updates on physical objects!
                //ScheduleTerseUpdate();
                //}
            }
@@ -1706,7 +1706,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Shape
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="shapeBlock"></param>
        public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock)
@@ -1750,7 +1750,7 @@ namespace OpenSim.Region.Environment.Scenes
            //m_log.Info("TSomething4:" + ((type & (ushort)ExtraParamType.Something4) == (ushort)ExtraParamType.Something4));
            //m_log.Info("TSomething5:" + ((type & (ushort)ExtraParamType.Something5) == (ushort)ExtraParamType.Something5));
            //m_log.Info("TSomething6:" + ((type & (ushort)ExtraParamType.Something6) == (ushort)ExtraParamType.Something6));
-            
            bool usePhysics = false;
            bool IsTemporary = false;
            bool IsPhantom = false;
@@ -1758,7 +1758,7 @@ namespace OpenSim.Region.Environment.Scenes
            bool wasUsingPhysics = ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) != 0);
            //bool IsLocked = false;
            int i = 0;
-            
            try
            {
@@ -1975,7 +1975,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Texture
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="textureEntry"></param>
        public void UpdateTextureEntry(byte[] textureEntry)
@@ -1985,7 +1985,7 @@ namespace OpenSim.Region.Environment.Scenes
            ScheduleFullUpdate();
        }
-        // Added to handle bug in libsecondlife's TextureEntry.ToBytes() 
+        // Added to handle bug in libsecondlife's TextureEntry.ToBytes()
        // not handling RGBA properly. Cycles through, and "fixes" the color
        // info
        public void UpdateTexture(LLObject.TextureEntry tex)
@@ -2030,7 +2030,7 @@ namespace OpenSim.Region.Environment.Scenes
            byte[] data = new byte[16];
            int pos = 0;
-            // The flags don't like conversion from uint to byte, so we have to do 
+            // The flags don't like conversion from uint to byte, so we have to do
            // it the crappy way.  See the above function :(
            data[pos] = ConvertScriptUintToByte(pTexAnim.Flags); pos++;
@@ -2059,7 +2059,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Position
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="pos"></param>
        public void UpdateOffSet(LLVector3 pos)
@@ -2115,7 +2115,7 @@ namespace OpenSim.Region.Environment.Scenes
            foreach (ScenePresence p in avatarts)
            {
                // TODO: some filtering by distance of avatar
-               
                p.ControllingClient.SendPreLoadSound(objectID, objectID, soundID);
            }
        }
@@ -2193,14 +2193,14 @@ namespace OpenSim.Region.Environment.Scenes
        #region Resizing/Scale
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="scale"></param>
        public void Resize(LLVector3 scale)
        {
            StoreUndoState();
            m_shape.Scale = scale;
-            
            ScheduleFullUpdate();
        }
@@ -2261,7 +2261,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        #region Client Update Methods
-        
        /// <summary>
        /// Tell all scene presences that they should send updates for this part to their clients
        /// </summary>
@@ -2287,7 +2287,7 @@ namespace OpenSim.Region.Environment.Scenes
                }
            }
        }
-    
        public void AddFullUpdateToAvatar(ScenePresence presence)
        {
@@ -2295,7 +2295,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void SendFullUpdateToAllClients()
        {
@@ -2309,7 +2309,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="remoteClient"></param>
        public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
@@ -2328,7 +2328,7 @@ namespace OpenSim.Region.Environment.Scenes
            lPos = OffsetPosition;
            SendFullUpdateToClient(remoteClient, lPos, clientflags);
        }
-   
        /// <summary>
        /// Sends a full update to the client
        /// </summary>
@@ -2338,7 +2338,7 @@ namespace OpenSim.Region.Environment.Scenes
        public void SendFullUpdateToClient(IClientAPI remoteClient, LLVector3 lPos, uint clientFlags)
        {
            clientFlags &= ~(uint) LLObject.ObjectFlags.CreateSelected;
-            
            if (remoteClient.AgentId == OwnerID)
            {
                if ((uint) (Flags & LLObject.ObjectFlags.CreateSelected) != 0)
@@ -2351,7 +2351,7 @@ namespace OpenSim.Region.Environment.Scenes
            byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
            remoteClient.SendPrimitiveToClient(
-                                               m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, 
+                                               m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
                                               lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid,
                                               OwnerID,
                                               m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID);
@@ -2373,7 +2373,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void SendTerseUpdateToAllClients()
        {
@@ -2451,7 +2451,7 @@ namespace OpenSim.Region.Environment.Scenes
                    m_parentGroup.AbsolutePosition = newpos;
                    return;
                }
-                
            }
            ScheduleTerseUpdate();
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 28507cd..ba8bbd9 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -40,7 +40,7 @@ using OpenSim.Region.Physics.Manager;
 namespace OpenSim.Region.Environment.Scenes
 {
-    enum ScriptControlled : int 
+    enum ScriptControlled : int
    {
        CONTROL_ZERO = 0,
        CONTROL_FWD = 1,
@@ -63,14 +63,14 @@ namespace OpenSim.Region.Environment.Scenes
        public ScriptControlled eventControls;
    }
-    [Serializable] 
+    [Serializable]
    public class ScenePresence : EntityBase, ISerializable
    {
 //        ~ScenePresence()
 //        {
 //            System.Console.WriteLine("[ScenePresence] Destructor called");
 //        }
-        
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        public static byte[] DefaultTexture;
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Scenes
        private LLVector3 m_requestedSitOffset = new LLVector3();
        private float m_sitAvatarHeight = 2.0f;
        private float m_godlevel = 0;
-        
        private bool m_invulnerable = true;
        private LLVector3 m_LastChildAgentUpdatePosition = new LLVector3();
@@ -114,7 +114,7 @@ namespace OpenSim.Region.Environment.Scenes
        private float m_health = 100f;
        private LLVector3 m_lastVelocity = LLVector3.Zero;
-        
        // Default AV Height
        private float m_avHeight = 127.0f;
@@ -213,10 +213,10 @@ namespace OpenSim.Region.Environment.Scenes
            get { return m_invulnerable; }
        }
-                public float GodLevel
+        public float GodLevel
-                {
+        {
-                        get { return m_godlevel; }
+            get { return m_godlevel; }
-                }
+        }
        private readonly ulong m_regionHandle;
@@ -260,7 +260,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// This works out to be the ClientView object associated with this avatar, or it's client connection manager
        /// </summary>
-        private IClientAPI m_controllingClient; 
+        private IClientAPI m_controllingClient;
        protected PhysicsActor m_physicsActor;
@@ -350,7 +350,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// If this is true, agent doesn't have a representation in this scene.
        ///    this is an agent 'looking into' this scene from a nearby scene(region)
-        /// 
+        ///
        /// if False, this agent has a representation in this scene
        /// </summary>
        private bool m_isChildAgent = true;
@@ -482,7 +482,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// Send updates to the client about prims which have been placed on the update queue.  We don't 
+        /// Send updates to the client about prims which have been placed on the update queue.  We don't
        /// necessarily send updates for all the parts on the queue, e.g. if an updates with a more recent
        /// timestamp has already been sent.
        /// </summary>
@@ -498,12 +498,12 @@ namespace OpenSim.Region.Environment.Scenes
            if (!m_gotAllObjectsInScene)
            {
                if (!m_isChildAgent || m_scene.m_seeIntoRegionFromNeighbor)
-                {                    
+                {
                    m_scene.SendAllSceneObjectsToClient(this);
-                    m_gotAllObjectsInScene = true;                    
+                    m_gotAllObjectsInScene = true;
                }
            }
-            
            if (m_partsUpdateQueue.Count > 0)
            {
                bool runUpdate = true;
@@ -520,12 +520,12 @@ namespace OpenSim.Region.Environment.Scenes
                        if (update.LastFullUpdateTime < part.TimeStampFull)
                        {
 //                            m_log.DebugFormat(
-//                                "[SCENE PRESENCE]: Fully   updating prim {0}, {1} - part timestamp {2}", 
+//                                "[SCENE PRESENCE]: Fully   updating prim {0}, {1} - part timestamp {2}",
 //                                part.Name, part.UUID, part.TimeStampFull);
-                            
                            part.SendFullUpdate(ControllingClient, GenerateClientFlags(part.UUID));
-                            // We'll update to the part's timestamp rather than the current time to 
+                            // We'll update to the part's timestamp rather than the current time to
                            // avoid the race condition whereby the next tick occurs while we are
                            // doing this update.  If this happened, then subsequent updates which occurred
                            // on the same tick or the next tick of the last update would be ignored.
@@ -536,9 +536,9 @@ namespace OpenSim.Region.Environment.Scenes
                        else if (update.LastTerseUpdateTime <= part.TimeStampTerse)
                        {
 //                            m_log.DebugFormat(
-//                                "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}", 
+//                                "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}",
 //                                part.Name, part.UUID, part.TimeStampTerse);
-                            
                            part.SendTerseUpdate(ControllingClient);
                            update.LastTerseUpdateTime = part.TimeStampTerse;
@@ -575,15 +575,15 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// This turns a child agent, into a root agent
-        /// This is called when an agent teleports into a region, or if an 
+        /// This is called when an agent teleports into a region, or if an
        /// agent crosses into this region from a neighbor over the border
        /// </summary>
        public void MakeRootAgent(LLVector3 pos, bool isFlying)
        {
 //            m_log.DebugFormat(
-//                 "[SCENEPRESENCE]: Upgrading child agent {0}, {1} to a root agent in {2}", 
+//                 "[SCENEPRESENCE]: Upgrading child agent {0}, {1} to a root agent in {2}",
 //                 Name, UUID, m_scene.RegionInfo.RegionName);
-            
            m_isChildAgent = false;
            AbsolutePosition = pos;
@@ -599,7 +599,7 @@ namespace OpenSim.Region.Environment.Scenes
            //{
            m_scene.SendAllSceneObjectsToClient(this);
            m_scene.LandChannel.SendLandUpdate(this, true);
-            
            //m_gotAllObjectsInScene = true;
            //}
        }
@@ -607,8 +607,8 @@ namespace OpenSim.Region.Environment.Scenes
        /// <summary>
        /// This turns a root agent into a child agent
        /// when an agent departs this region for a neighbor, this gets called.
-        /// 
+        ///
-        /// It doesn't get called for a teleport.  Reason being, an agent that 
+        /// It doesn't get called for a teleport.  Reason being, an agent that
        /// teleports out may not be anywhere near this region
        /// </summary>
        public void MakeChildAgent()
@@ -616,15 +616,15 @@ namespace OpenSim.Region.Environment.Scenes
            m_animations.Clear();
 //            m_log.DebugFormat(
-//                 "[SCENEPRESENCE]: Downgrading child agent {0}, {1} to a root agent in {2}", 
+//                 "[SCENEPRESENCE]: Downgrading child agent {0}, {1} to a root agent in {2}",
 //                 Name, UUID, m_scene.RegionInfo.RegionName);
-            
            Velocity = new LLVector3(0, 0, 0);
            m_isChildAgent = true;
            m_scene.SwapRootAgentCount(true);
            RemoveFromPhysicalScene();
            m_scene.EventManager.TriggerOnMakeChildAgent(this);
-            //this.Pos = new LLVector3(128, 128, 70);  
+            //this.Pos = new LLVector3(128, 128, 70);
        }
        /// <summary>
@@ -643,7 +643,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="pos"></param>
        public void Teleport(LLVector3 pos)
@@ -656,7 +656,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void StopMovement()
        {
@@ -762,7 +762,7 @@ namespace OpenSim.Region.Environment.Scenes
            uint flags = agentData.ControlFlags;
            LLQuaternion bodyRotation = agentData.BodyRotation;
-            // Camera location in world.  We'll need to raytrace 
+            // Camera location in world.  We'll need to raytrace
            // from this location from time to time.
            m_CameraCenter.x = agentData.CameraCenter.X;
            m_CameraCenter.y = agentData.CameraCenter.Y;
@@ -815,7 +815,7 @@ namespace OpenSim.Region.Environment.Scenes
            // m_AgentControlFlags = flags;
            // m_headrotation = agentData.AgentData.HeadRotation;
            // m_state = agentData.AgentData.State;
-            
            if (m_allowMovement)
            {
                int i = 0;
@@ -870,7 +870,7 @@ namespace OpenSim.Region.Environment.Scenes
                        i++;
                    }
                }
-                // Cause the avatar to stop flying if it's colliding 
+                // Cause the avatar to stop flying if it's colliding
                // with something with the down arrow pressed.
                // Skip if there's no physicsactor
@@ -886,7 +886,7 @@ namespace OpenSim.Region.Environment.Scenes
                        // Are the collision requirements fulfilled?
                        bool colliding = (m_physicsActor.IsColliding == true);
-                        
                        if (m_physicsActor.Flying && colliding && controlland)
                        {
@@ -903,9 +903,9 @@ namespace OpenSim.Region.Environment.Scenes
                        UpdateMovementAnimations();
                }
            }
-            
            m_scene.EventManager.TriggerOnClientMovement(this);
-            
            m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS);
        }
@@ -934,7 +934,7 @@ namespace OpenSim.Region.Environment.Scenes
                m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
                m_parentPosition = new LLVector3();
-                
                m_parentID = 0;
                SendFullUpdateToAllClients();
@@ -949,10 +949,10 @@ namespace OpenSim.Region.Environment.Scenes
        private void SendSitResponse(IClientAPI remoteClient, LLUUID targetID, LLVector3 offset)
        {
-            
-            
-            
            bool autopilot = true;
            LLVector3 pos = new LLVector3();
            LLQuaternion sitOrientation = new LLQuaternion(0, 0, 0, 1);
@@ -1008,10 +1008,10 @@ namespace OpenSim.Region.Environment.Scenes
            }
            ControllingClient.SendSitResponse(targetID, offset, sitOrientation, autopilot, LLVector3.Zero, LLVector3.Zero, false);
-            
-            // This calls HandleAgentSit twice, once from here, and the client calls 
+            // This calls HandleAgentSit twice, once from here, and the client calls
            // HandleAgentSit itself after it gets to the location
-            // It doesn't get to the location until we've moved them there though 
+            // It doesn't get to the location until we've moved them there though
            // which happens in HandleAgentSit :P
            if (!autopilot)
                HandleAgentSit(remoteClient, UUID);
@@ -1256,7 +1256,7 @@ namespace OpenSim.Region.Environment.Scenes
            }
            m_perfMonMS = System.Environment.TickCount;
-            
            m_rotation = rotation;
            NewForce newVelocity = new NewForce();
            Vector3 direc = rotation*vec;
@@ -1268,9 +1268,9 @@ namespace OpenSim.Region.Environment.Scenes
                direc *= 4;
                //bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0));
                //bool colliding = (m_physicsActor.IsColliding==true);
-                //if (controlland) 
+                //if (controlland)
                //    m_log.Info("[AGENT]: landCommand");
-                //if (colliding) 
+                //if (colliding)
                //    m_log.Info("[AGENT]: colliding");
                //if (m_physicsActor.Flying && colliding && controlland)
                //{
@@ -1306,7 +1306,7 @@ namespace OpenSim.Region.Environment.Scenes
        #region Overridden Methods
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public override void Update()
        {
@@ -1383,7 +1383,7 @@ namespace OpenSim.Region.Environment.Scenes
            lastPhysPos = AbsolutePosition;
            m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS);
-            
        }
        public void SendCoarseLocations()
@@ -1433,7 +1433,7 @@ namespace OpenSim.Region.Environment.Scenes
            foreach (ScenePresence avatar in avatars)
            {
                SendFullUpdateToOtherClient(avatar);
-                
                if (avatar.LocalId != LocalId)
                {
                    if (!avatar.m_isChildAgent || m_scene.m_seeIntoRegionFromNeighbor)
@@ -1448,7 +1448,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void SendInitialData()
        {
@@ -1472,7 +1472,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="client"></param>
        public void SendOwnAppearance()
@@ -1481,7 +1481,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void SendAppearanceToAllOtherAgents()
        {
@@ -1498,7 +1498,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        public void SendAppearanceToOtherAgent(ScenePresence avatar)
-        { 
+        {
            avatar.ControllingClient.SendAppearance(
                                                    m_appearance.Owner,
                                                    m_appearance.VisualParams,
@@ -1522,7 +1522,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="animations"></param>
        /// <param name="seqs"></param>
@@ -1536,7 +1536,7 @@ namespace OpenSim.Region.Environment.Scenes
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        public void SendAnimPack()
        {
@@ -1568,7 +1568,7 @@ namespace OpenSim.Region.Environment.Scenes
            }
            // Minimum Draw distance is 64 meters, the Radius of the draw distance sphere is 32m
-            if (Util.GetDistanceTo(AbsolutePosition,m_LastChildAgentUpdatePosition) > 32) 
+            if (Util.GetDistanceTo(AbsolutePosition,m_LastChildAgentUpdatePosition) > 32)
            {
                ChildAgentDataUpdate cadu = new ChildAgentDataUpdate();
                cadu.ActiveGroupID=LLUUID.Zero.UUID;
@@ -1593,14 +1593,14 @@ namespace OpenSim.Region.Environment.Scenes
                    multiplier = 0.25f;
                }
-                //m_log.Info("[NeighborThrottle]: " + m_scene.GetInaccurateNeighborCount().ToString() + " - m: " + multiplier.ToString()); 
+                //m_log.Info("[NeighborThrottle]: " + m_scene.GetInaccurateNeighborCount().ToString() + " - m: " + multiplier.ToString());
                cadu.throttles = ControllingClient.GetThrottlesPacked(multiplier);
-                
-                
-                
-                cadu.Velocity = new sLLVector3(Velocity); 
+                cadu.Velocity = new sLLVector3(Velocity);
                m_scene.SendOutChildAgentUpdates(cadu,this);
                m_LastChildAgentUpdatePosition.X = AbsolutePosition.X;
                m_LastChildAgentUpdatePosition.Y = AbsolutePosition.Y;
@@ -1681,9 +1681,9 @@ namespace OpenSim.Region.Environment.Scenes
            ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
            SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle);
            if (neighbourRegion != null)
-            {       
+            {
                // When the neighbour is informed of the border crossing, it will set up CAPS handlers for the avatar
-                // This means we need to remove the current caps handler here and possibly compensate later, 
+                // This means we need to remove the current caps handler here and possibly compensate later,
                // in case both scenes are being hosted on the same region server.  Messy
                m_scene.RemoveCapsHandler(UUID);
                newpos = newpos + (vel);
@@ -1691,17 +1691,17 @@ namespace OpenSim.Region.Environment.Scenes
                    m_scene.InformNeighbourOfCrossing(neighbourHandle, m_controllingClient.AgentId, newpos,
                                                      m_physicsActor.Flying);
                if (res)
-                {                                        
+                {
                    AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
-                    // TODO Should construct this behind a method                   
+                    // TODO Should construct this behind a method
-                    string capsPath = 
+                    string capsPath =
                        "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort
                         + "/CAPS/" + circuitdata.CapsPath + "0000/";
-                    
                    m_log.DebugFormat(
-                        "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid);                                        
+                        "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid);
-                    
                    m_controllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
                                                    capsPath);
                    MakeChildAgent();
@@ -1742,17 +1742,17 @@ namespace OpenSim.Region.Environment.Scenes
        /// </summary>
        public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
        {
-            // 
+            //
            int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize;
            int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize;
-            
            m_DrawDistance = cAgentData.drawdistance;
            m_pos = new LLVector3(cAgentData.Position.x + shiftx, cAgentData.Position.y + shifty, cAgentData.Position.z);
            // It's hard to say here..   We can't really tell where the camera position is unless it's in world cordinates from the sending region
            m_CameraCenter =
                new Vector3(cAgentData.cameraPosition.x, cAgentData.cameraPosition.y, cAgentData.cameraPosition.z);
-            
            m_godlevel = cAgentData.godlevel;
            SetHeight(cAgentData.AVHeight);
@@ -1793,8 +1793,8 @@ namespace OpenSim.Region.Environment.Scenes
                        }
                        catch (NullReferenceException)
                        {
-                            // Under extreme load, this returns a NullReference Exception that we can ignore. 
+                            // Under extreme load, this returns a NullReference Exception that we can ignore.
-                            // Ignoring this causes no movement to be sent to the physics engine...  
+                            // Ignoring this causes no movement to be sent to the physics engine...
                            // which when the scene is moving at 1 frame every 10 seconds, it doesn't really matter!
                        }
                        m_newForce = true;
@@ -1809,12 +1809,12 @@ namespace OpenSim.Region.Environment.Scenes
        static ScenePresence()
        {
-            
            LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
            DefaultTexture = textu.ToBytes();
        }
-        [Serializable] 
+        [Serializable]
        public class NewForce
        {
            public float X;
@@ -1826,8 +1826,8 @@ namespace OpenSim.Region.Environment.Scenes
            }
        }
-        [Serializable] 
+        [Serializable]
-        public class ScenePartUpdate : ISerializable 
+        public class ScenePartUpdate : ISerializable
        {
            public LLUUID FullID;
            public uint LastFullUpdateTime;
@@ -1883,7 +1883,7 @@ namespace OpenSim.Region.Environment.Scenes
        public void AddToPhysicalScene()
        {
            PhysicsScene scene = m_scene.PhysicsScene;
-            
            PhysicsVector pVec =
                new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y,
                                  AbsolutePosition.Z);
@@ -1936,7 +1936,7 @@ namespace OpenSim.Region.Environment.Scenes
                if (m_health <= 0)
                    m_scene.EventManager.TriggerAvatarKill(killerObj, this);
            }
-            
            if (Velocity.X > 0 || Velocity.Y > 0)
                UpdateMovementAnimations();
        }
@@ -2161,7 +2161,7 @@ namespace OpenSim.Region.Environment.Scenes
            // m_partsUpdateQueue = (UpdateQueue)info.GetValue("m_partsUpdateQueue", typeof(UpdateQueue));
            /*
-            Dictionary<Guid, ScenePartUpdate> updateTimes_work 
+            Dictionary<Guid, ScenePartUpdate> updateTimes_work
                = (Dictionary<Guid, ScenePartUpdate>)info.GetValue("m_updateTimes", typeof(Dictionary<Guid, ScenePartUpdate>));
            foreach (Guid id in updateTimes_work.Keys)
@@ -2188,7 +2188,7 @@ namespace OpenSim.Region.Environment.Scenes
                    (float)info.GetValue("lastKnownAllowedPosition.X", typeof(float)),
                    (float)info.GetValue("lastKnownAllowedPosition.Y", typeof(float)),
                    (float)info.GetValue("lastKnownAllowedPosition.Z", typeof(float)));
-            
            sentMessageAboutRestrictedParcelFlyingDown = (bool)info.GetValue("sentMessageAboutRestrictedParcelFlyingDown", typeof(bool));
            m_LastChildAgentUpdatePosition
@@ -2196,7 +2196,7 @@ namespace OpenSim.Region.Environment.Scenes
                    (float)info.GetValue("m_LastChildAgentUpdatePosition.X", typeof(float)),
                    (float)info.GetValue("m_LastChildAgentUpdatePosition.Y", typeof(float)),
                    (float)info.GetValue("m_LastChildAgentUpdatePosition.Z", typeof(float)));
-            
            m_perfMonMS = (int)info.GetValue("m_perfMonMS", typeof(int));
            m_AgentControlFlags = (uint)info.GetValue("m_AgentControlFlags", typeof(uint));
@@ -2246,7 +2246,7 @@ namespace OpenSim.Region.Environment.Scenes
            info.AddValue("m_sitAvatarHeight", m_sitAvatarHeight);
            info.AddValue("m_godlevel", m_godlevel);
            info.AddValue("m_setAlwaysRun", m_setAlwaysRun);
-            
            // Quaternion
            info.AddValue("m_bodyRot.w", m_bodyRot.w);
            info.AddValue("m_bodyRot.x", m_bodyRot.x);
@@ -2374,7 +2374,7 @@ namespace OpenSim.Region.Environment.Scenes
        public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, LLUUID Script_item_LLUUID)
        {
-            
            ScriptControllers obj = new ScriptControllers();
            obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
            obj.eventControls = ScriptControlled.CONTROL_ZERO;
@@ -2386,7 +2386,7 @@ namespace OpenSim.Region.Environment.Scenes
                IgnoredControls |= (ScriptControlled)controls;
                obj.ignoreControls = (ScriptControlled)controls;
            }
-            
            if (pass_on == 0 && accept == 1)
            {
                IgnoredControls |= (ScriptControlled)controls;
@@ -2432,7 +2432,7 @@ namespace OpenSim.Region.Environment.Scenes
            lock (scriptedcontrols)
            {
                scriptedcontrols.Clear();
-            } 
+            }
            ControllingClient.SendTakeControls(int.MaxValue, false, false);
        }
@@ -2454,7 +2454,7 @@ namespace OpenSim.Region.Environment.Scenes
        internal void SendControlToScripts(uint flags, ScriptControlled lastFlags)
        {
-            
            ScriptControlled allflags = ScriptControlled.CONTROL_ZERO;
            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) != 0)
@@ -2497,10 +2497,10 @@ namespace OpenSim.Region.Environment.Scenes
            {
                allflags |= ScriptControlled.CONTROL_LBUTTON;
            }
-            
            ScriptControlled held = ScriptControlled.CONTROL_ZERO;
            ScriptControlled change = ScriptControlled.CONTROL_ZERO;
-            
            foreach (ScriptControlled DCF in Enum.GetValues(typeof (ScriptControlled)))
            {
                // Held
@@ -2539,7 +2539,7 @@ namespace OpenSim.Region.Environment.Scenes
                }
            }
            LastCommands = allflags;
-            
        }
        internal uint RemoveIgnoredControls(uint flags, ScriptControlled Ignored)
        {
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
index 8390f64..7d048a3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Environment.Scenes
                        obj.ResetIDs();
                    }
                    //if we want this to be a import method then we need new uuids for the object to avoid any clashes
-                    //obj.RegenerateFullIDs(); 
+                    //obj.RegenerateFullIDs();
                    m_innerScene.AddEntity(obj);
                    SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
@@ -143,7 +143,7 @@ namespace OpenSim.Region.Environment.Scenes
        {
            XmlDocument doc = new XmlDocument();
            XmlNode rootNode;
-           
            XmlTextReader reader = new XmlTextReader(new StringReader(xmlString));
            reader.WhitespaceHandling = WhitespaceHandling.None;
            doc.Load(reader);
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                CreatePrimFromXml(aPrimNode.OuterXml);
            }
-         
        }
        public void LoadPrimsFromXml2(string fileName)
@@ -206,7 +206,7 @@ namespace OpenSim.Region.Environment.Scenes
                    rootPart.PhysActor.LocalID = rootPart.LocalId;
                    rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
                }
-                rootPart.Velocity = receivedVelocity;                 
+                rootPart.Velocity = receivedVelocity;
            }
            obj.ScheduleGroupForFullUpdate();
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
index a150164..90a971f 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
@@ -97,12 +97,12 @@ namespace OpenSim.Region.Environment.Scenes
        private int m_scriptLinesPerSecond = 0;
        private int objectCapacity = 45000;
-       
        SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[21];
        SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock();
        SimStatsPacket statpack = (SimStatsPacket)PacketPool.Instance.GetPacket(PacketType.SimStats);
-        
        private RegionInfo ReportingRegion;
@@ -138,8 +138,8 @@ namespace OpenSim.Region.Environment.Scenes
            lock (m_report)
            {
                // Packet is already initialized and ready for data insert
-                
-                
                statpack.Region = rb;
                statpack.Region.RegionX = ReportingRegion.RegionLocX;
                statpack.Region.RegionY = ReportingRegion.RegionLocY;
@@ -152,99 +152,99 @@ namespace OpenSim.Region.Environment.Scenes
                    statpack.Region.RegionFlags = (uint) 0;
                }
                statpack.Region.ObjectCapacity = (uint) objectCapacity;
-                
 #region various statistic googly moogly
-                
                // Our FPS is actually 10fps, so multiplying by 5 to get the amount that people expect there
                // 0-50 is pretty close to 0-45
                float simfps = (int) ((m_fps * 5));
-                
                //if (simfps > 45)
                //simfps = simfps - (simfps - 45);
                //if (simfps < 0)
                //simfps = 0;
-                
                //
                float physfps = ((m_pfps / 1000));
-                
                //if (physfps > 600)
                //physfps = physfps - (physfps - 600);
-                
                if (physfps < 0)
                    physfps = 0;
-                
 #endregion
-                
-                //Our time dilation is 0.91 when we're running a full speed, 
+                //Our time dilation is 0.91 when we're running a full speed,
-                // therefore to make sure we get an appropriate range, 
+                // therefore to make sure we get an appropriate range,
-                // we have to factor in our error.   (0.10f * statsUpdateFactor) 
+                // we have to factor in our error.   (0.10f * statsUpdateFactor)
                // multiplies the fix for the error times the amount of times it'll occur a second
                // / 10 divides the value by the number of times the sim heartbeat runs (10fps)
                // Then we divide the whole amount by the amount of seconds pass in between stats updates.
-                
                sb[0].StatID = (uint) Stats.TimeDilation;
                sb[0].StatValue = m_timeDilation ; //((((m_timeDilation + (0.10f * statsUpdateFactor)) /10)  / statsUpdateFactor));
-                
                sb[1].StatID = (uint) Stats.SimFPS;
                sb[1].StatValue = simfps/statsUpdateFactor;
-                
                sb[2].StatID = (uint) Stats.PhysicsFPS;
                sb[2].StatValue = physfps / statsUpdateFactor;
-                
                sb[3].StatID = (uint) Stats.AgentUpdates;
                sb[3].StatValue = (m_agentUpdates / statsUpdateFactor);
-                
                sb[4].StatID = (uint) Stats.Agents;
                sb[4].StatValue = m_rootAgents;
-                
                sb[5].StatID = (uint) Stats.ChildAgents;
                sb[5].StatValue = m_childAgents;
-                
                sb[6].StatID = (uint) Stats.TotalPrim;
                sb[6].StatValue = m_numPrim;
-                
                sb[7].StatID = (uint) Stats.ActivePrim;
                sb[7].StatValue = m_activePrim;
-                
                sb[8].StatID = (uint)Stats.FrameMS;
                sb[8].StatValue = m_frameMS / statsUpdateFactor;
-                
                sb[9].StatID = (uint)Stats.NetMS;
                sb[9].StatValue = m_netMS / statsUpdateFactor;
-                
                sb[10].StatID = (uint)Stats.PhysicsMS;
                sb[10].StatValue = m_physicsMS / statsUpdateFactor;
-                
                sb[11].StatID = (uint)Stats.ImageMS ;
                sb[11].StatValue = m_imageMS / statsUpdateFactor;
-                
                sb[12].StatID = (uint)Stats.OtherMS;
                sb[12].StatValue = m_otherMS / statsUpdateFactor;
-                
                sb[13].StatID = (uint)Stats.InPacketsPerSecond;
                sb[13].StatValue = (m_inPacketsPerSecond);
-                
                sb[14].StatID = (uint)Stats.OutPacketsPerSecond;
                sb[14].StatValue = (m_outPacketsPerSecond / statsUpdateFactor);
-                
                sb[15].StatID = (uint)Stats.UnAckedBytes;
                sb[15].StatValue = m_unAckedBytes;
-                
                sb[16].StatID = (uint)Stats.AgentMS;
                sb[16].StatValue = m_agentMS / statsUpdateFactor;
-                
                sb[17].StatID = (uint)Stats.PendingDownloads;
                sb[17].StatValue = m_pendingDownloads;
-                
                sb[18].StatID = (uint)Stats.PendingUploads;
                sb[18].StatValue = m_pendingUploads;
-                
                sb[19].StatID = (uint)Stats.ActiveScripts;
                sb[19].StatValue = m_activeScripts;
-                
                sb[20].StatID = (uint)Stats.ScriptLinesPerSecond;
                sb[20].StatValue = m_scriptLinesPerSecond / statsUpdateFactor;
-                
                statpack.Stat = sb;
                handlerSendStatResult = OnSendStatsResult;
@@ -255,7 +255,7 @@ namespace OpenSim.Region.Environment.Scenes
                resetvalues();
            }
        }
-        
        private void resetvalues()
        {
            m_timeDilation = 0;
@@ -274,13 +274,13 @@ namespace OpenSim.Region.Environment.Scenes
            m_imageMS = 0;
            m_otherMS = 0;
-//Ckrinke This variable is not used, so comment to remove compiler warning until it is used.            
+//Ckrinke This variable is not used, so comment to remove compiler warning until it is used.
 //Ckrinke            m_scriptMS = 0;
        }
        # region methods called from Scene
        // The majority of these functions are additive
-        // so that you can easily change the amount of 
+        // so that you can easily change the amount of
        // seconds in between sim stats updates
        public void AddTimeDilation(float td)
@@ -368,14 +368,14 @@ namespace OpenSim.Region.Environment.Scenes
        {
            m_otherMS += ms;
        }
-        
-//        private static readonly log4net.ILog m_log 
+//        private static readonly log4net.ILog m_log
 //            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        
        public void addPendingDownload(int count)
        {
            m_pendingDownloads += count;
-            //m_log.InfoFormat("[stats]: Adding {0} to pending downloads to make {1}", count, m_pendingDownloads);            
+            //m_log.InfoFormat("[stats]: Adding {0} to pending downloads to make {1}", count, m_pendingDownloads);
        }
        public void addScriptLines(int count)
diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Environment/Types/UpdateQueue.cs
index ec1ffd2..e9133ac 100644
--- a/OpenSim/Region/Environment/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Environment/Types/UpdateQueue.cs
@@ -34,8 +34,8 @@ using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Types
 {
-    [Serializable] 
+    [Serializable]
-    public class UpdateQueue : ISerializable 
+    public class UpdateQueue : ISerializable
    {
        private Queue<SceneObjectPart> m_queue;
author	Jeff Ames	2008-05-16 01:22:11 +0000
committer	Jeff Ames	2008-05-16 01:22:11 +0000
commit	65c5efe43b68700bad94076d4cd421160203c5de (patch)
tree	589b56649ed02f4942671fd6e51c6dc43f682e0d /OpenSim/Region/Environment
parent	Thank you very much, mjm for : (diff)
download	opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.zip opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.gz opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.bz2 opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.xz