6 files changed, 1 insertions, 54 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index e80f6ab..3486c8b 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -53,7 +53,6 @@ namespace OpenSim.Region.Communications.Hypergrid
             userServices.AddPlugin(new HGUserDataPlugin(this, userServices));
             
             m_userService = userServices;
-            m_messageService = userServices;
             m_avatarService = userServices;
         }
     }
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 4e3f5a1..d979a01 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -60,9 +60,7 @@ namespace OpenSim.Region.Communications.Hypergrid
             
             m_userService = hgUserService;
             m_userAdminService = hgUserService;
-            m_avatarService = hgUserService;
-            m_messageService = hgUserService;
-            
+            m_avatarService = hgUserService;            
         }
     }
 }
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index eaf996d..4f83fdb 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -51,7 +51,6 @@ namespace OpenSim.Region.Communications.Local
             m_userService = lus;
             m_userAdminService = lus;
             m_avatarService = lus;
-            m_messageService = lus;
 
             //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);
         }
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 94e4ed2..111b7c0 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -46,7 +46,6 @@ namespace OpenSim.Region.Communications.OGS1
             userServices.AddPlugin(new OGS1UserDataPlugin(this));
             
             m_userService = userServices;
-            m_messageService = userServices;
             m_avatarService = (IAvatarService)m_userService;
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e22dd2d..ef62b79 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3979,35 +3979,6 @@ namespace OpenSim.Region.Framework.Scenes
             objectCapacity = objects;
         }
 
-        public List<FriendListItem> GetFriendList(string id)
-        {
-            UUID avatarID;
-            if (!UUID.TryParse(id, out avatarID))
-                return new List<FriendListItem>();
-
-            return CommsManager.GetUserFriendList(avatarID);
-        }
-
-        public Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos(List<UUID> uuids)
-        {
-            return CommsManager.GetFriendRegionInfos(uuids);
-        }
-
-        public virtual void StoreAddFriendship(UUID ownerID, UUID friendID, uint perms)
-        {
-            m_sceneGridService.AddNewUserFriend(ownerID, friendID, perms);
-        }
-
-        public virtual void StoreUpdateFriendship(UUID ownerID, UUID friendID, uint perms)
-        {
-            m_sceneGridService.UpdateUserFriendPerms(ownerID, friendID, perms);
-        }
-
-        public virtual void StoreRemoveFriendship(UUID ownerID, UUID ExfriendID)
-        {
-            m_sceneGridService.RemoveUserFriend(ownerID, ExfriendID);
-        }
-
         #endregion
 
         public void HandleObjectPermissionsUpdate(IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set)
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 53693e4..8b14f61 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1455,25 +1455,6 @@ namespace OpenSim.Region.Framework.Scenes
              m_commsProvider.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
         }
 
-        public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
-        {
-            m_commsProvider.AddNewUserFriend(friendlistowner, friend, perms);
-        }
-
-        public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
-        {
-            m_commsProvider.UpdateUserFriendPerms(friendlistowner, friend, perms);
-        }
-
-        public void RemoveUserFriend(UUID friendlistowner, UUID friend)
-        {
-            m_commsProvider.RemoveUserFriend(friendlistowner, friend);
-        }
-
-        public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
-        {
-            return m_commsProvider.GetUserFriendList(friendlistowner);
-        }
 
         public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
         {