diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs index 5c89d0f..56f130e 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs | |||
| @@ -99,7 +99,6 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | return FailureResult(); | 101 | return FailureResult(); |
| 102 | |||
| 103 | } | 102 | } |
| 104 | 103 | ||
| 105 | #region Method-specific handlers | 104 | #region Method-specific handlers |
| @@ -127,7 +126,6 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
| 127 | return FailureResult(); | 126 | return FailureResult(); |
| 128 | } | 127 | } |
| 129 | 128 | ||
| 130 | string perms = "0"; | ||
| 131 | FriendInfo[] friendsInfo = m_FriendsService.GetFriends(principalID); | 129 | FriendInfo[] friendsInfo = m_FriendsService.GetFriends(principalID); |
| 132 | foreach (FriendInfo finfo in friendsInfo) | 130 | foreach (FriendInfo finfo in friendsInfo) |
| 133 | { | 131 | { |