5 files changed, 18 insertions, 18 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index aaa331b..7980de3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     m_Enabled = true;
                     m_log.DebugFormat("[FRIENDS MODULE]: {0} enabled.", Name);
                 }
-            }            
+            }
         }
 
         protected virtual void InitModule(IConfigSource config)
@@ -570,7 +570,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         protected virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
             if ((InstantMessageDialog)im.dialog == InstantMessageDialog.FriendshipOffered)
-            { 
+            {
                 // we got a friendship offer
                 UUID principalID = new UUID(im.fromAgentID);
                 UUID friendID = new UUID(im.toAgentID);
@@ -605,7 +605,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             im.imSessionID = im.fromAgentID;
             im.fromAgentName = GetFriendshipRequesterName(agentID);
 
-            // Try the local sim            
+            // Try the local sim
             if (LocalFriendshipOffered(friendID, im))
                 return true;
 
@@ -648,7 +648,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 ccm.CreateCallingCard(client.AgentId, friendID, UUID.Zero);
             }
 
-            // Update the local cache. 
+            // Update the local cache.
             RecacheFriends(client);
 
             //
@@ -704,7 +704,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 }
             }
         }
-        
+
         public void RemoveFriendship(IClientAPI client, UUID exfriendID)
         {
             if (!DeleteFriendship(client.AgentId, exfriendID))
@@ -732,7 +732,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
                     m_FriendsSimConnector.FriendshipTerminated(region, client.AgentId, exfriendID);
                 }
-            }            
+            }
         }
 
         public void FindFriend(IClientAPI remoteClient,UUID HunterID ,UUID PreyID)
@@ -740,7 +740,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             UUID requester = remoteClient.AgentId;
             if(requester != HunterID) // only allow client agent to be the hunter (?)
                 return;
-            
+
             FriendInfo[] friends = GetFriendsFromCache(requester);
             if (friends.Length == 0)
                 return;
@@ -773,7 +773,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
 
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { PreyID.ToString() });
-            
+
             if (friendSessions == null || friendSessions.Length == 0)
                 return;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index c421740..81aa882 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             UserAccount account = m_FriendsModule.UserAccountService.GetUserAccount(UUID.Zero, fromID);
             string name = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
 
-            GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID, 
+            GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID,
                 (byte)InstantMessageDialog.FriendshipOffered, message, false, Vector3.Zero);
 
             // !! HACK
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index 9954749..ac05a6e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -539,8 +539,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         //            m_log.DebugFormat("[HGFRIENDS MODULE] HG Friendship! thisUUI={0}; friendUUI={1}; foreignThisFriendService={2}; foreignFriendFriendService={3}",
         //              agentUUI, friendUUI, agentFriendService, friendFriendService);
 
-                }                
-                
+                }
+
                 // Delete any previous friendship relations
                 DeletePreviousRelations(agentID, friendID);
 
@@ -641,11 +641,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                             FriendsService.Delete(a1, f.Friend);
                             // and also the converse
                             FriendsService.Delete(f.Friend, a1.ToString());
-                        }                            
+                        }
                     }
                 }
             }
-                        
+
             finfos = GetFriendsFromCache(a1);
             if (finfos != null)
             {
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                             FriendsService.Delete(a2, f.Friend);
                             // and also the converse
                             FriendsService.Delete(f.Friend, a2.ToString());
-                        }                            
+                        }
                     }
                 }
             }
@@ -783,7 +783,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     m_log.DebugFormat("[HGFRIENDS MODULE]: Forwading friendship from {0} to {1} @ {2}", agentID, friendID, friendsURL);
                     GridRegion region = new GridRegion();
                     region.ServerURI = friendsURL;
-                    
+
                     string name = im.fromAgentName;
                     if (m_uMan.IsLocalGridUser(agentID))
                     {
@@ -815,7 +815,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     }
 
                     m_HGFriendsConnector.FriendshipOffered(region, agentID, friendID, im.message, name);
-                 
+
                     return true;
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
index 1fa4dd6..3fae271 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             {
                 if (kvp.Key != "local")
                 {
-                    // For the others, call the user agent service 
+                    // For the others, call the user agent service
                     List<string> ids = new List<string>();
                     foreach (FriendInfo f in kvp.Value)
                         ids.Add(f.Friend);
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
index e6fd54e..3d9bd35 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests
             // so that different services and simulator can share the data in standalone mode.  This is pretty horrible
             // effectively the statics are global variables.
             NullFriendsData.Clear();
-                
+
             IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
             // Not strictly necessary since FriendsModule assumes it is the default (!)