diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Services/Connectors/Friends | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Services/Connectors/Friends')
| -rw-r--r-- | OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs index b7702a8..873b554 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs | |||
| @@ -86,7 +86,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | #region IFriendsService | 88 | #region IFriendsService |
| 89 | 89 | ||
| 90 | public FriendInfo[] GetFriends(UUID PrincipalID) | 90 | public FriendInfo[] GetFriends(UUID PrincipalID) |
| 91 | { | 91 | { |
| 92 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 92 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |