9 files changed, 102 insertions, 87 deletions

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 39c0066..3ad137e 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -245,7 +245,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
             m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
             m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
-            if(m_openSim.userStatsURI != String.Empty )
+            if (m_openSim.userStatsURI != String.Empty )
                 m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
         }
 
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index e14843b..1daa07f 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -413,9 +413,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         private bool getBoolean(Hashtable requestData, string tag, bool defv)
         {
             // If an access value has been provided, apply it.
-            if(requestData.Contains(tag))
+            if (requestData.Contains(tag))
             {
-                switch(((string)requestData[tag]).ToLower())
+                switch (((string)requestData[tag]).ToLower())
                 {
                     case "true" :
                     case "t" :
@@ -670,7 +670,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     {
                         List<ILandObject> parcels = ((Scene)newscene).LandChannel.AllParcels();
 
-                        foreach(ILandObject parcel in parcels)
+                        foreach (ILandObject parcel in parcels)
                         {
                             parcel.landData.Flags |= (uint) Parcel.ParcelFlags.AllowVoiceChat;
                             parcel.landData.Flags |= (uint) Parcel.ParcelFlags.UseEstateVoiceChan;
@@ -826,7 +826,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         bool enableVoice = getBoolean(requestData, "enable_voice", true);
                         List<ILandObject> parcels = ((Scene)scene).LandChannel.AllParcels();
 
-                        foreach(ILandObject parcel in parcels)
+                        foreach (ILandObject parcel in parcels)
                         {
                             if (enableVoice)
                             {
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 6c54924..74b504e 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework
             { 
                 m_creatorId = value;
                 UUID creatorIdAsUuid;
-                
+
                 // For now, all IDs are UUIDs
                 UUID.TryParse(m_creatorId, out creatorIdAsUuid);
                 CreatorIdAsUuid = creatorIdAsUuid;
@@ -63,7 +63,7 @@ namespace OpenSim.Framework
         }
 
         private string m_creatorId = String.Empty;        
-        
+
         /// <value>
         /// The creator of this item expressed as a UUID
         /// </value>
@@ -105,7 +105,7 @@ namespace OpenSim.Framework
         ///
         /// </value>        
         public uint EveryOnePermissions;
-        
+
         /// <value>
         ///
         /// </value>        
@@ -150,10 +150,10 @@ namespace OpenSim.Framework
         ///
         /// </value>        
         public int CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-                
-                public object Clone()
-                {
-                        return MemberwiseClone();
-                }
+
+        public object Clone()
+        {
+            return MemberwiseClone();
+        }
     }
 }
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 37924d7..76e48e5 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -210,7 +210,7 @@ namespace OpenSim.Framework
 
         public static T GetDataBlock<T>() where T: new()
         {
-            lock(DataBlocks)
+            lock (DataBlocks)
             {
                 if (DataBlocks.ContainsKey(typeof(T)) && DataBlocks[typeof(T)].Count > 0)
                 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index 1882005..aef0ada 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -36,13 +36,13 @@ using System.Reflection;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
-        /// <summary>
-        /// We use this class to store image data and associated request data and attributes
-        /// </summary>
+    /// <summary>
+    /// We use this class to store image data and associated request data and attributes
+    /// </summary>
     public class J2KImage
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-                
+
         public double m_designatedPriorityKey;
         public double m_requestedPriority = 0.0d;
         public uint m_lastSequence = 0;
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public AssetBase m_MissingSubstitute = null;
         public bool m_decoded = false;
         public bool m_completedSendAtCurrentDiscardLevel;
-                
+
         private sbyte m_discardLevel=-1;
         private uint m_packetNumber;
         private bool m_decoderequested = false;
@@ -135,6 +135,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             return ((bytePosition - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1;
         }
+
         public int LastPacketSize()
         {
             if (m_packetNumber == 1)
@@ -146,8 +147,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 lastsize = cImagePacketSize;
             }
             return lastsize;
-         }
-
+        }
  
         public int CurrentBytePosition()
         {
@@ -215,7 +215,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         complete = true;
                     }
                 }
-                
+
                 // It's concievable that the client might request packet one
                 // from a one packet image, which is really packet 0,
                 // which would leave us with a negative imagePacketSize..
@@ -234,7 +234,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     //Send the packet
                     client.SendImageNextPart((ushort)(m_packetNumber-1), m_requestedUUID, imageData);
-                    
                 }
                 if (complete)
                 {
@@ -257,7 +256,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 if (m_packetNumber <= m_stopPacket)
                 {
-
                     bool SendMore = true;
                     if (!m_sentinfo || (m_packetNumber == 0))
                     {
@@ -273,8 +271,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         m_packetNumber = 2;
                     }
-                    
-                    int count=0;  
+
+                    int count = 0;
                     while (SendMore && count < 5 && m_packetNumber <= m_stopPacket)
                     {
                         count++;
@@ -284,13 +282,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     if (m_packetNumber > m_stopPacket)
                     {
-
                         return true;
-
                     }
-
                 }
-
             }
             return false;
         }
@@ -343,12 +337,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
                 else
                 {
-
-   
                     //discardLevel of -1 means just update the priority
                     if (m_requestedDiscardLevel != -1)
                     {
-
                         //Evaluate the discard level
                         //First, is it positive?
                         if (m_requestedDiscardLevel >= 0)
@@ -361,7 +352,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             {
                                 m_discardLevel = m_requestedDiscardLevel;
                             }
-                                
+
                             //Calculate the m_stopPacket
                             if (Layers.Length > 0)
                             {
@@ -382,18 +373,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             {
                                 m_packetNumber = m_requestedPacketNumber;
                             }
-                   
+
                             if (m_packetNumber <= m_stopPacket)
                             {
                                 m_completedSendAtCurrentDiscardLevel = false;
                             }
-
                         }
-
                     }
                 }
             }
         }
-
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 9ffff97..9b39292 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -248,7 +248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void Cancel(uint sequence)
         {
-            while(contents.Remove(sequence))
+            while (contents.Remove(sequence))
                 ;
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 924d6d9..b5c0d86 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
     public class InventoryArchiveWriteRequest
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <value>
         /// Used to select all inventory nodes in a folder but not the folder itself
         /// </value>
@@ -58,12 +58,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         private string m_invPath;        
         protected TarArchiveWriter m_archive;
         protected UuidGatherer m_assetGatherer;
-        
+
         /// <value>
         /// Used to collect the uuids of the assets that we need to save into the archive
         /// </value>
         protected Dictionary<UUID, int> m_assetUuids = new Dictionary<UUID, int>();
-        
+
         /// <value>
         /// Used to collect the uuids of the users that we need to save into the archive
         /// </value>
@@ -125,16 +125,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         protected void SaveInvItem(InventoryItemBase inventoryItem, string path)
         {
             string filename = string.Format("{0}{1}_{2}.xml", path, inventoryItem.Name, inventoryItem.ID);            
-                        
+
             // Record the creator of this item for user record purposes (which might go away soon)
             m_userUuids[inventoryItem.CreatorIdAsUuid] = 1;
-                        
+
             InventoryItemBase saveItem = (InventoryItemBase)inventoryItem.Clone();
             saveItem.CreatorId = OspResolver.MakeOspa(saveItem.CreatorIdAsUuid, m_module.CommsManager);
-                        
+
             string serialization = UserInventoryItemSerializer.Serialize(saveItem);
             m_archive.WriteFile(filename, serialization);
-            
+
             m_assetGatherer.GatherAssetUuids(saveItem.AssetID, (AssetType)saveItem.AssetType, m_assetUuids);
         }
 
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         inventoryFolder.Name,
                         ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR,
                         inventoryFolder.ID);
-                
+
                 // We need to make sure that we record empty folders            
                 m_archive.WriteDir(path);
             }
@@ -225,12 +225,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
 
             bool foundStar = false;
-            
+
             // Eliminate double slashes and any leading / on the path.  This might be better done within InventoryFolderImpl
             // itself (possibly at a small loss in efficiency).
             string[] components
                 = m_invPath.Split(new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries);
-            
+
             int maxComponentIndex = components.Length - 1;
 
             // If the path terminates with a STAR then later on we want to archive all nodes in the folder but not the
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 foundStar = true;
                 maxComponentIndex--;                
             }
-            
+
             m_invPath = String.Empty;
             for (int i = 0; i <= maxComponentIndex; i++)
             {
@@ -296,24 +296,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 //recurse through all dirs getting dirs and files
                 SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH, !foundStar);
             }
-            
+
             SaveUsers();
             new AssetsRequest(m_assetUuids.Keys, m_module.CommsManager.AssetCache, ReceivedAllAssets).Execute();
         }
-        
+
         /// <summary>
         /// Save information for the users that we've collected.
         /// </summary>
         protected void SaveUsers()
         {
             m_log.InfoFormat("[INVENTORY ARCHIVER]: Saving user information for {0} users", m_userUuids.Count);
-            
+
             foreach (UUID creatorId in m_userUuids.Keys)
             {
                 // Record the creator of this item
                 CachedUserInfo creator 
                     = m_module.CommsManager.UserProfileCacheService.GetUserDetails(creatorId);
-            
+
                 if (creator != null)
                 {
                     m_archive.WriteFile(
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4dc1661..a516a5a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1861,7 +1861,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             bool welcome  = true;
 
-            if(m_regInfo.EstateSettings.IsBanned(client.AgentId) && (!Permissions.IsGod(client.AgentId)))
+            if (m_regInfo.EstateSettings.IsBanned(client.AgentId) && (!Permissions.IsGod(client.AgentId)))
             {
                 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
                                 client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);
@@ -1876,7 +1876,7 @@ namespace OpenSim.Region.Framework.Scenes
                 welcome = false;
             }
 
-            if(!welcome)
+            if (!welcome)
             {
                 try
                 {
@@ -1899,46 +1899,46 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                                SubscribeToClientEvents(client);
-                                ScenePresence presence;
+                SubscribeToClientEvents(client);
+                ScenePresence presence;
 
-                                if (m_restorePresences.ContainsKey(client.AgentId))
-                                {
-                                        m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName);
+                if (m_restorePresences.ContainsKey(client.AgentId))
+                {
+                    m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName);
 
-                                        presence = m_restorePresences[client.AgentId];
-                                        m_restorePresences.Remove(client.AgentId);
+                    presence = m_restorePresences[client.AgentId];
+                    m_restorePresences.Remove(client.AgentId);
 
-                                        // This is one of two paths to create avatars that are
-                                        // used.  This tends to get called more in standalone
-                                        // than grid, not really sure why, but as such needs
-                                        // an explicity appearance lookup here.
-                                        AvatarAppearance appearance = null;
-                                        GetAvatarAppearance(client, out appearance);
-                                        presence.Appearance = appearance;
+                    // This is one of two paths to create avatars that are
+                    // used.  This tends to get called more in standalone
+                    // than grid, not really sure why, but as such needs
+                    // an explicity appearance lookup here.
+                    AvatarAppearance appearance = null;
+                    GetAvatarAppearance(client, out appearance);
+                    presence.Appearance = appearance;
 
-                                        presence.initializeScenePresence(client, RegionInfo, this);
+                    presence.initializeScenePresence(client, RegionInfo, this);
 
-                                        m_sceneGraph.AddScenePresence(presence);
+                    m_sceneGraph.AddScenePresence(presence);
 
-                                        lock (m_restorePresences)
-                                        {
-                                                Monitor.PulseAll(m_restorePresences);
-                                        }
-                                }
-                                else
-                                {
-                                        m_log.DebugFormat(
-                                                "[SCENE]: Adding new child agent for {0} in {1}",
-                                                client.Name, RegionInfo.RegionName);
+                    lock (m_restorePresences)
+                    {
+                        Monitor.PulseAll(m_restorePresences);
+                    }
+                }
+                else
+                {
+                    m_log.DebugFormat(
+                        "[SCENE]: Adding new child agent for {0} in {1}",
+                        client.Name, RegionInfo.RegionName);
 
-                                        CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
+                    CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
 
-                                        CreateAndAddScenePresence(client);
-                                }
+                    CreateAndAddScenePresence(client);
+                }
 
-                                m_LastLogin = Environment.TickCount;
-                                EventManager.TriggerOnNewClient(client);
+                m_LastLogin = Environment.TickCount;
+                EventManager.TriggerOnNewClient(client);
             }
         }
 
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs
index 0e8191f..051ee9a 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserService.cs
@@ -1,3 +1,30 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 namespace OpenSim.Services.Interfaces
 {
     public interface IUserService