5 files changed, 35 insertions, 34 deletions

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 937f7c4..575d9d5 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -50,4 +50,4 @@ namespace OpenSim.Region.Communications.Local
             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 f6137f7..4dec884 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -29,8 +29,8 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Console;
 
 namespace OpenSim.Region.Communications.Local
 {
@@ -50,21 +50,17 @@ namespace OpenSim.Region.Communications.Local
         public string gdebugRegionName
         {
             get { return _gdebugRegionName; }
-            set
-            {
-                _gdebugRegionName = value;
-            }
+            set { _gdebugRegionName = value; }
         }
+
         public string _rdebugRegionName = "";
 
         public string rdebugRegionName
         {
             get { return _rdebugRegionName; }
-            set
-            {
-                _rdebugRegionName = value;
-            }
+            set { _rdebugRegionName = value; }
         }
+
         public LocalBackEndServices()
         {
         }
@@ -85,7 +81,8 @@ namespace OpenSim.Region.Communications.Local
                 RegionCommsListener regionHost = new RegionCommsListener();
                 if (m_regionListeners.ContainsKey(regionInfo.RegionHandle))
                 {
-                    MainLog.Instance.Error("INTERREGION", "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region.  In Standalone mode this will cause BIG issues.  In grid mode, it means a region went down and came back up.");
+                    MainLog.Instance.Error("INTERREGION",
+                                           "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region.  In Standalone mode this will cause BIG issues.  In grid mode, it means a region went down and came back up.");
                     m_regionListeners.Remove(regionInfo.RegionHandle);
                 }
                 m_regionListeners.Add(regionInfo.RegionHandle, regionHost);
@@ -195,7 +192,7 @@ namespace OpenSim.Region.Communications.Local
             return mapBlocks;
         }
 
-        
+
         public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
         {
             RegionInfo region = new RegionInfo(sregion);
@@ -203,7 +200,7 @@ namespace OpenSim.Region.Communications.Local
             {
                 return m_regionListeners[regionhandle].TriggerRegionUp(region);
             }
-           
+
             return false;
         }
 
@@ -224,7 +221,7 @@ namespace OpenSim.Region.Communications.Local
         // It never gets called.
         public virtual Dictionary<string, string> GetGridSettings()
         {
-            Dictionary<string,string> returnGridSettings = new Dictionary<string,string>();
+            Dictionary<string, string> returnGridSettings = new Dictionary<string, string>();
             lock (m_queuedGridSettings)
             {
                 returnGridSettings = m_queuedGridSettings;
@@ -237,7 +234,6 @@ namespace OpenSim.Region.Communications.Local
         public virtual void SetForcefulBanlistsDisallowed(ulong regionHandle)
         {
             m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE");
-
         }
 
         public bool TriggerRegionUp(RegionInfo region, ulong regionhandle)
@@ -254,7 +250,7 @@ namespace OpenSim.Region.Communications.Local
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
-                return m_regionListeners[regionHandle].TriggerChildAgentUpdate(regionHandle,cAgentData);
+                return m_regionListeners[regionHandle].TriggerChildAgentUpdate(regionHandle, cAgentData);
             }
             return false;
         }
@@ -282,7 +278,7 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
-        public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData) 
+        public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -291,6 +287,7 @@ namespace OpenSim.Region.Communications.Local
             }
             return false;
         }
+
         /// <summary>
         /// 
         /// </summary>
@@ -308,6 +305,7 @@ namespace OpenSim.Region.Communications.Local
             }
             return false;
         }
+
         public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
@@ -322,7 +320,7 @@ namespace OpenSim.Region.Communications.Local
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
-              m_regionListeners[regionHandle].TriggerCloseAgentConnection(regionHandle, agentID);
+                m_regionListeners[regionHandle].TriggerCloseAgentConnection(regionHandle, agentID);
             }
         }
 
@@ -334,6 +332,7 @@ namespace OpenSim.Region.Communications.Local
             }
             return false;
         }
+
         public bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
@@ -415,14 +414,15 @@ namespace OpenSim.Region.Communications.Local
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
-                return m_regionListeners[regionHandle].TriggerExpectPrimCrossing(regionHandle, primID, position, isPhysical);
+                return
+                    m_regionListeners[regionHandle].TriggerExpectPrimCrossing(regionHandle, primID, position, isPhysical);
             }
             return false;
         }
 
         public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
         {
-           // MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname);
+            // MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname);
 
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -435,4 +435,4 @@ 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 08bd850..730c40f 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -82,14 +82,14 @@ namespace OpenSim.Region.Communications.Local
         {
             DeleteItem(item);
         }
-        
+
         /// <summary>
         /// Send the given inventory folder and its item contents back to the requester.
         /// </summary>
         /// <param name="userID"></param>
         /// <param name="folder"></param>
         private InventoryFolderImpl RequestInventoryFolder(LLUUID userID, InventoryFolderBase folder,
-                                                           InventoryFolderInfo folderCallBack, 
+                                                           InventoryFolderInfo folderCallBack,
                                                            InventoryItemInfo itemCallBack)
         {
             InventoryFolderImpl newFolder = new InventoryFolderImpl(folder);
@@ -99,9 +99,9 @@ namespace OpenSim.Region.Communications.Local
             foreach (InventoryItemBase item in items)
             {
                 itemCallBack(userID, item);
-            }   
-            
+            }
+
             return newFolder;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 2c08707..bf5f205 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Communications.Local
             if (!authUsers)
             {
                 //no current user account so make one
-                MainLog.Instance.Notice("LOGIN", "No user account found so creating a new one.");                
+                MainLog.Instance.Notice("LOGIN", "No user account found so creating a new one.");
 
                 m_userManager.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
 
@@ -93,14 +93,14 @@ namespace OpenSim.Region.Communications.Local
             if (!authUsers)
             {
                 //for now we will accept any password in sandbox mode
-                MainLog.Instance.Notice("LOGIN", "Authorising user (no actual password check)"); 
-                
+                MainLog.Instance.Notice("LOGIN", "Authorising user (no actual password check)");
+
                 return true;
             }
             else
             {
                 MainLog.Instance.Notice(
-                    "LOGIN", "Authenticating " + profile.username + " " + profile.surname);                 
+                    "LOGIN", "Authenticating " + profile.username + " " + profile.surname);
 
                 password = password.Remove(0, 3); //remove $1$
 
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Communications.Local
                 // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/";
                 theUser.currentAgent.currentRegion = reg.RegionID;
                 theUser.currentAgent.currentHandle = reg.RegionHandle;
-                
+
                 LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList();
                 buddyList.AddNewBuddy(new LoginResponse.BuddyList.BuddyInfo("11111111-1111-0000-0000-000100bba000"));
                 response.BuddList = buddyList;
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Communications.Local
             }
             else
             {
-                MainLog.Instance.Warn("LOGIN", "Not found region " + currentRegion);              
+                MainLog.Instance.Warn("LOGIN", "Not found region " + currentRegion);
             }
         }
 
@@ -207,4 +207,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 d8c4b1d..6269565 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -27,6 +27,7 @@
 */
 
 using System;
+using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.UserManagement;
@@ -82,7 +83,7 @@ namespace OpenSim.Region.Communications.Local
             return profile;
         }
 
-        public override UserProfileData SetupMasterUser(libsecondlife.LLUUID uuid)
+        public override UserProfileData SetupMasterUser(LLUUID uuid)
         {
             UserProfileData data = GetUserProfile(uuid);
             if (data == null)