aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
diff options
context:
space:
mode:
authorJeff Ames2008-03-18 14:51:42 +0000
committerJeff Ames2008-03-18 14:51:42 +0000
commitbf8b5844f24d294c459f54147bd511e7112288bf (patch)
tree1b6a1ba4e9888d43694a8a33c21beb6913ce2d3a /OpenSim/Region/Communications/Local
parent* Applied Grumly57 patch for #781; Thanks, Grumly! (diff)
downloadopensim-SC_OLD-bf8b5844f24d294c459f54147bd511e7112288bf.zip
opensim-SC_OLD-bf8b5844f24d294c459f54147bd511e7112288bf.tar.gz
opensim-SC_OLD-bf8b5844f24d294c459f54147bd511e7112288bf.tar.bz2
opensim-SC_OLD-bf8b5844f24d294c459f54147bd511e7112288bf.tar.xz
Formatting cleanup. Minor refactoring.
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs12
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs4
2 files changed, 8 insertions, 8 deletions
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
212 } 212 }
213 return mapBlocks; 213 return mapBlocks;
214 } 214 }
215
215 public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 216 public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
216 { 217 {
217 if (m_regionListeners.ContainsKey(regionHandle)) 218 if (m_regionListeners.ContainsKey(regionHandle))
@@ -245,7 +246,7 @@ namespace OpenSim.Region.Communications.Local
245 return false; 246 return false;
246 } 247 }
247 248
248 // This function Is only here to keep this class in line with the Grid Interface. 249 // This function is only here to keep this class in line with the Grid Interface.
249 // It never gets called. 250 // It never gets called.
250 public virtual Dictionary<string, string> GetGridSettings() 251 public virtual Dictionary<string, string> GetGridSettings()
251 { 252 {
@@ -291,14 +292,15 @@ namespace OpenSim.Region.Communications.Local
291 } 292 }
292 return false; 293 return false;
293 } 294 }
294 /// <summary> 295
296 /// <summary>
297 ///
295 /// </summary> 298 /// </summary>
296 /// <param name="regionHandle"></param> 299 /// <param name="regionHandle"></param>
297 /// <param name="agentData"></param> 300 /// <param name="agentData"></param>
298 /// <returns></returns> 301 /// <returns></returns>
299 ///
300 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) 302 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
301 //should change from agentCircuitData 303 // TODO: should change from agentCircuitData
302 { 304 {
303 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); 305 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
304 //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname); 306 //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
352 return false; 354 return false;
353 } 355 }
354 356
355
356
357 public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId) 357 public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId)
358 { 358 {
359 if (m_regionListeners.ContainsKey(regionHandle)) 359 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
68 authUsers = authenticate; 68 authUsers = authenticate;
69 } 69 }
70 70
71
72 public override UserProfileData GetTheUser(string firstname, string lastname) 71 public override UserProfileData GetTheUser(string firstname, string lastname)
73 { 72 {
74 UserProfileData profile = m_userManager.GetUserProfile(firstname, lastname); 73 UserProfileData profile = m_userManager.GetUserProfile(firstname, lastname);
@@ -189,6 +188,7 @@ namespace OpenSim.Region.Communications.Local
189 m_log.Warn("[LOGIN]: Not found region " + currentRegion); 188 m_log.Warn("[LOGIN]: Not found region " + currentRegion);
190 } 189 }
191 } 190 }
191
192 private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL) 192 private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL)
193 { 193 {
194 LoginResponse.BuddyList buddylistreturn = new LoginResponse.BuddyList(); 194 LoginResponse.BuddyList buddylistreturn = new LoginResponse.BuddyList();
@@ -199,10 +199,10 @@ namespace OpenSim.Region.Communications.Local
199 buddyitem.BuddyRightsHave = (int)fl.FriendListOwnerPerms; 199 buddyitem.BuddyRightsHave = (int)fl.FriendListOwnerPerms;
200 buddyitem.BuddyRightsGiven = (int)fl.FriendPerms; 200 buddyitem.BuddyRightsGiven = (int)fl.FriendPerms;
201 buddylistreturn.AddNewBuddy(buddyitem); 201 buddylistreturn.AddNewBuddy(buddyitem);
202
203 } 202 }
204 return buddylistreturn; 203 return buddylistreturn;
205 } 204 }
205
206 protected override InventoryData CreateInventoryData(LLUUID userID) 206 protected override InventoryData CreateInventoryData(LLUUID userID)
207 { 207 {
208 List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID); 208 List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID);