From bf8b5844f24d294c459f54147bd511e7112288bf Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 18 Mar 2008 14:51:42 +0000 Subject: Formatting cleanup. Minor refactoring. --- OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 12 ++++++------ OpenSim/Region/Communications/Local/LocalLoginService.cs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/Communications/Local') diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index 8cc1312..de891a2 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs @@ -212,6 +212,7 @@ namespace OpenSim.Region.Communications.Local } return mapBlocks; } + public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) { if (m_regionListeners.ContainsKey(regionHandle)) @@ -245,7 +246,7 @@ namespace OpenSim.Region.Communications.Local return false; } - // This function Is only here to keep this class in line with the Grid Interface. + // This function is only here to keep this class in line with the Grid Interface. // It never gets called. public virtual Dictionary GetGridSettings() { @@ -291,14 +292,15 @@ namespace OpenSim.Region.Communications.Local } return false; } - /// + + /// + /// /// /// /// /// - /// public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) - //should change from agentCircuitData + // TODO: should change from agentCircuitData { //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname); @@ -352,8 +354,6 @@ namespace OpenSim.Region.Communications.Local return false; } - - public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId) { if (m_regionListeners.ContainsKey(regionHandle)) diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index eff597e..dca8e65 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs @@ -68,7 +68,6 @@ namespace OpenSim.Region.Communications.Local authUsers = authenticate; } - public override UserProfileData GetTheUser(string firstname, string lastname) { UserProfileData profile = m_userManager.GetUserProfile(firstname, lastname); @@ -189,6 +188,7 @@ namespace OpenSim.Region.Communications.Local m_log.Warn("[LOGIN]: Not found region " + currentRegion); } } + private LoginResponse.BuddyList ConvertFriendListItem(List LFL) { LoginResponse.BuddyList buddylistreturn = new LoginResponse.BuddyList(); @@ -199,10 +199,10 @@ namespace OpenSim.Region.Communications.Local buddyitem.BuddyRightsHave = (int)fl.FriendListOwnerPerms; buddyitem.BuddyRightsGiven = (int)fl.FriendPerms; buddylistreturn.AddNewBuddy(buddyitem); - } return buddylistreturn; } + protected override InventoryData CreateInventoryData(LLUUID userID) { List folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID); -- cgit v1.1