6 files changed, 97 insertions, 95 deletions

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index ef5150f..eac293e 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -25,32 +25,30 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
+using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework;
 
 namespace OpenSim.Region.Communications.Local
 {
     public class CommunicationsLocal : CommunicationsManager
     {
         public CommunicationsLocal(
-            NetworkServersInfo serversInfo, 
-            BaseHttpServer httpServer, 
-            AssetCache assetCache, 
-            IUserService userService, 
-            LocalInventoryService inventoryService, 
-            IInterRegionCommunications interRegionService, 
-            IGridServices gridService, bool dumpAssetsToFile )
+            NetworkServersInfo serversInfo,
+            BaseHttpServer httpServer,
+            AssetCache assetCache,
+            IUserService userService,
+            LocalInventoryService inventoryService,
+            IInterRegionCommunications interRegionService,
+            IGridServices gridService, bool dumpAssetsToFile)
             : base(serversInfo, httpServer, assetCache, dumpAssetsToFile)
         {
             m_inventoryService = inventoryService;
             m_userService = userService;
             m_gridService = gridService;
             m_interRegion = interRegionService;
-
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 99c4bc3..3a0b47f 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -25,25 +25,25 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
+using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework;
-using System.Collections;
 
 namespace OpenSim.Region.Communications.Local
 {
-
     public class LocalBackEndServices : IGridServices, IInterRegionCommunications
     {
         protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>();
-        protected Dictionary<ulong, RegionCommsListener> m_regionListeners = new Dictionary<ulong, RegionCommsListener>();
+
+        protected Dictionary<ulong, RegionCommsListener> m_regionListeners =
+            new Dictionary<ulong, RegionCommsListener>();
+
         private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
 
         public LocalBackEndServices()
         {
-
         }
 
         /// <summary>
@@ -54,13 +54,13 @@ namespace OpenSim.Region.Communications.Local
         public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
         {
             //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
-            if (!this.m_regions.ContainsKey((uint)regionInfo.RegionHandle))
+            if (!m_regions.ContainsKey((uint) regionInfo.RegionHandle))
             {
                 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
-                this.m_regions.Add(regionInfo.RegionHandle, regionInfo);
+                m_regions.Add(regionInfo.RegionHandle, regionInfo);
 
                 RegionCommsListener regionHost = new RegionCommsListener();
-                this.m_regionListeners.Add(regionInfo.RegionHandle, regionHost);
+                m_regionListeners.Add(regionInfo.RegionHandle, regionHost);
 
                 return regionHost;
             }
@@ -103,9 +103,9 @@ namespace OpenSim.Region.Communications.Local
         /// <returns></returns>
         public RegionInfo RequestNeighbourInfo(ulong regionHandle)
         {
-            if (this.m_regions.ContainsKey(regionHandle))
+            if (m_regions.ContainsKey(regionHandle))
             {
-                return this.m_regions[regionHandle];
+                return m_regions[regionHandle];
             }
             return null;
         }
@@ -121,16 +121,18 @@ namespace OpenSim.Region.Communications.Local
         public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
         {
             List<MapBlockData> mapBlocks = new List<MapBlockData>();
-            foreach (RegionInfo regInfo in this.m_regions.Values)
+            foreach (RegionInfo regInfo in m_regions.Values)
             {
-                if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) && ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
+                if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) &&
+                    ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
                 {
                     MapBlockData map = new MapBlockData();
                     map.Name = regInfo.RegionName;
-                    map.X = (ushort)regInfo.RegionLocX;
-                    map.Y = (ushort)regInfo.RegionLocY;
-                    map.WaterHeight = (byte)regInfo.EstateSettings.waterHeight;
-                    map.MapImageId = regInfo.EstateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007");
+                    map.X = (ushort) regInfo.RegionLocX;
+                    map.Y = (ushort) regInfo.RegionLocY;
+                    map.WaterHeight = (byte) regInfo.EstateSettings.waterHeight;
+                    map.MapImageId = regInfo.EstateSettings.terrainImageID;
+                        //new LLUUID("00000000-0000-0000-9999-000000000007");
                     map.Agents = 1;
                     map.RegionFlags = 72458694;
                     map.Access = 13;
@@ -145,13 +147,14 @@ namespace OpenSim.Region.Communications.Local
         /// <param name="regionHandle"></param>
         /// <param name="agentData"></param>
         /// <returns></returns>
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+            //should change from agentCircuitData
         {
             //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
-            if (this.m_regionListeners.ContainsKey(regionHandle))
+            if (m_regionListeners.ContainsKey(regionHandle))
             {
                 // Console.WriteLine("CommsManager- Informing a region to expect child agent");
-                this.m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
+                m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
                 return true;
             }
             return false;
@@ -166,10 +169,10 @@ namespace OpenSim.Region.Communications.Local
         /// <returns></returns>
         public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
         {
-            if (this.m_regionListeners.ContainsKey(regionHandle))
+            if (m_regionListeners.ContainsKey(regionHandle))
             {
                 // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing");
-                this.m_regionListeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position, isFlying);
+                m_regionListeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position, isFlying);
                 return true;
             }
             return false;
@@ -177,7 +180,7 @@ namespace OpenSim.Region.Communications.Local
 
         public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId)
         {
-            if (this.m_regionListeners.ContainsKey(regionHandle))
+            if (m_regionListeners.ContainsKey(regionHandle))
             {
                 return true;
             }
@@ -210,15 +213,15 @@ namespace OpenSim.Region.Communications.Local
 
         public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
         {
-            if (this.m_regionListeners.ContainsKey(regionHandle))
+            if (m_regionListeners.ContainsKey(regionHandle))
             {
-                this.m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent);
+                m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent);
             }
         }
 
         public void PingCheckReply(Hashtable respData)
         {
-            foreach (ulong region in this.m_regions.Keys)
+            foreach (ulong region in m_regions.Keys)
             {
                 Hashtable regData = new Hashtable();
                 RegionInfo reg = m_regions[region];
@@ -234,7 +237,7 @@ namespace OpenSim.Region.Communications.Local
             if (m_regionListeners.ContainsKey(regionHandle))
             {
                 return m_regionListeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position,
-                                                                                 isFlying);
+                                                                                   isFlying);
             }
 
             return false;
@@ -250,11 +253,5 @@ namespace OpenSim.Region.Communications.Local
 
             return false;
         }
-
-
-
     }
-}
-
-
-
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index b7d78bc..c38e922 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -28,29 +28,28 @@
 
 using System.Collections.Generic;
 using libsecondlife;
+using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework;
 
 namespace OpenSim.Region.Communications.Local
 {
     public class LocalInventoryService : InventoryServiceBase
     {
-
         public LocalInventoryService()
         {
-
         }
 
-        public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
+        public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack,
+                                                     InventoryItemInfo itemCallBack)
         {
-            List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID);
+            List<InventoryFolderBase> folders = RequestFirstLevelFolders(userID);
             InventoryFolderImpl rootFolder = null;
 
             //need to make sure we send root folder first
             foreach (InventoryFolderBase folder in folders)
             {
-                if (folder.parentID == libsecondlife.LLUUID.Zero)
+                if (folder.parentID == LLUUID.Zero)
                 {
                     InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
                     rootFolder = newfolder;
@@ -67,7 +66,7 @@ namespace OpenSim.Region.Communications.Local
                         InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
                         folderCallBack(userID, newfolder);
 
-                        List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID);
+                        List<InventoryItemBase> items = RequestFolderItems(newfolder.folderID);
                         foreach (InventoryItemBase item in items)
                         {
                             itemCallBack(userID, item);
@@ -79,17 +78,17 @@ namespace OpenSim.Region.Communications.Local
 
         public override void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder)
         {
-            this.AddFolder(folder);
+            AddFolder(folder);
         }
 
         public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
         {
-            this.AddItem(item);
+            AddItem(item);
         }
 
         public override void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
         {
-            this.deleteItem(item);
+            deleteItem(item);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 1043683..aa1a0d9 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
-using OpenSim.Framework.Communications;
 using OpenSim.Framework;
 using OpenSim.Framework.UserManagement;
+using InventoryFolder=OpenSim.Framework.InventoryFolder;
 
 namespace OpenSim.Region.Communications.Local
 {
@@ -49,23 +49,23 @@ namespace OpenSim.Region.Communications.Local
 
         public event LoginToRegionEvent OnLoginToRegion;
 
-        public LocalLoginService(UserManagerBase userManager, string welcomeMess, CommunicationsLocal parent, NetworkServersInfo serversInfo, bool authenticate)
+        public LocalLoginService(UserManagerBase userManager, string welcomeMess, CommunicationsLocal parent,
+                                 NetworkServersInfo serversInfo, bool authenticate)
             : base(userManager, welcomeMess)
         {
             m_Parent = parent;
             this.serversInfo = serversInfo;
             defaultHomeX = this.serversInfo.DefaultHomeLocX;
             defaultHomeY = this.serversInfo.DefaultHomeLocY;
-            this.authUsers = authenticate;
+            authUsers = authenticate;
         }
 
 
         public override UserProfileData GetTheUser(string firstname, string lastname)
         {
-            UserProfileData profile = this.m_userManager.GetUserProfile(firstname, lastname);
+            UserProfileData profile = m_userManager.GetUserProfile(firstname, lastname);
             if (profile != null)
             {
-
                 return profile;
             }
 
@@ -73,9 +73,9 @@ namespace OpenSim.Region.Communications.Local
             {
                 //no current user account so make one
                 Console.WriteLine("No User account found so creating a new one ");
-                this.m_userManager.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
+                m_userManager.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
 
-                profile = this.m_userManager.GetUserProfile(firstname, lastname);
+                profile = m_userManager.GetUserProfile(firstname, lastname);
                 if (profile != null)
                 {
                     m_Parent.InventoryService.CreateNewUserInventory(profile.UUID);
@@ -113,18 +113,22 @@ namespace OpenSim.Region.Communications.Local
 
             if (reg != null)
             {
-                response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " +
-                 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
-                 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
+                response.Home = "{'region_handle':[r" + (reg.RegionLocX*256).ToString() + ",r" +
+                                (reg.RegionLocY*256).ToString() + "], " +
+                                "'position':[r" + theUser.homeLocation.X.ToString() + ",r" +
+                                theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
+                                "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" +
+                                theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
                 string capsPath = Util.GetRandomCapsPath();
                 response.SimAddress = reg.ExternalEndPoint.Address.ToString();
-                response.SimPort = (Int32)reg.ExternalEndPoint.Port;
+                response.SimPort = (Int32) reg.ExternalEndPoint.Port;
                 response.RegionX = reg.RegionLocX;
                 response.RegionY = reg.RegionLocY;
-                
 
-                response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
-               // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/";
+
+                response.SeedCapability = "http://" + reg.ExternalHostName + ":" +
+                                          serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
+                // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/";
                 theUser.currentAgent.currentRegion = reg.RegionID;
                 theUser.currentAgent.currentHandle = reg.RegionHandle;
 
@@ -135,11 +139,11 @@ namespace OpenSim.Region.Communications.Local
                 _login.Agent = response.AgentID;
                 _login.Session = response.SessionID;
                 _login.SecureSession = response.SecureSessionID;
-                _login.CircuitCode = (uint)response.CircuitCode;
+                _login.CircuitCode = (uint) response.CircuitCode;
                 _login.StartPos = new LLVector3(128, 128, 70);
                 _login.CapsPath = capsPath;
 
-                if( OnLoginToRegion != null )
+                if (OnLoginToRegion != null)
                 {
                     OnLoginToRegion(currentRegion, _login);
                 }
@@ -148,7 +152,6 @@ namespace OpenSim.Region.Communications.Local
             {
                 Console.WriteLine("not found region " + currentRegion);
             }
-
         }
 
         protected override InventoryData CreateInventoryData(LLUUID userID)
@@ -168,8 +171,8 @@ namespace OpenSim.Region.Communications.Local
                     TempHash = new Hashtable();
                     TempHash["name"] = InvFolder.name;
                     TempHash["parent_id"] = InvFolder.parentID.ToStringHyphenated();
-                    TempHash["version"] = (Int32)InvFolder.version;
-                    TempHash["type_default"] = (Int32)InvFolder.type;
+                    TempHash["version"] = (Int32) InvFolder.version;
+                    TempHash["type_default"] = (Int32) InvFolder.type;
                     TempHash["folder_id"] = InvFolder.folderID.ToStringHyphenated();
                     AgentInventoryArray.Add(TempHash);
                 }
@@ -182,13 +185,13 @@ namespace OpenSim.Region.Communications.Local
 
                 ArrayList AgentInventoryArray = new ArrayList();
                 Hashtable TempHash;
-                foreach (OpenSim.Framework.InventoryFolder InvFolder in userInventory.InventoryFolders.Values)
+                foreach (InventoryFolder InvFolder in userInventory.InventoryFolders.Values)
                 {
                     TempHash = new Hashtable();
                     TempHash["name"] = InvFolder.FolderName;
                     TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
-                    TempHash["version"] = (Int32)InvFolder.Version;
-                    TempHash["type_default"] = (Int32)InvFolder.DefaultType;
+                    TempHash["version"] = (Int32) InvFolder.Version;
+                    TempHash["type_default"] = (Int32) InvFolder.DefaultType;
                     TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();
                     AgentInventoryArray.Add(TempHash);
                 }
@@ -197,4 +200,4 @@ namespace OpenSim.Region.Communications.Local
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 1dede97..a7687c7 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -27,8 +27,8 @@
 */
 
 using System;
-using OpenSim.Framework.Communications;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications;
 using OpenSim.Framework.UserManagement;
 
 namespace OpenSim.Region.Communications.Local
@@ -41,7 +41,8 @@ namespace OpenSim.Region.Communications.Local
         private IInventoryServices m_inventoryService;
 
 
-        public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY, IInventoryServices inventoryService)
+        public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY,
+                                 IInventoryServices inventoryService)
         {
             m_serversInfo = serversInfo;
 
@@ -49,7 +50,6 @@ namespace OpenSim.Region.Communications.Local
             m_defaultHomeY = defaultHomeLocY;
 
             m_inventoryService = inventoryService;
-            
         }
 
         public override UserProfileData SetupMasterUser(string firstName, string lastName)
@@ -82,4 +82,4 @@ namespace OpenSim.Region.Communications.Local
             return profile;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
index ca64319..481577e 100644
--- a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
@@ -1,24 +1,28 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
+
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Region.Communications.Local")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Region.Communications.Local")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+
+[assembly : AssemblyTitle("OpenSim.Region.Communications.Local")]
+[assembly : AssemblyDescription("")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("")]
+[assembly : AssemblyProduct("OpenSim.Region.Communications.Local")]
+[assembly : AssemblyCopyright("Copyright ©  2007")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+
+[assembly : ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fb173926-bd0a-4cd0-bb45-185b2f72ddfb")]
+
+[assembly : Guid("fb173926-bd0a-4cd0-bb45-185b2f72ddfb")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -29,5 +33,6 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly : AssemblyVersion("1.0.0.0")]
+[assembly : AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file