diff options
author | Diva Canto | 2011-05-21 16:48:00 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-21 16:48:00 -0700 |
commit | 58c53c41de2cae0bb041a2e8121792e136d1edb2 (patch) | |
tree | b792158cd178f88234f86ab4d72c4224b45fe6ba /OpenSim/Data/MSSQL/MSSQLFriendsData.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-58c53c41de2cae0bb041a2e8121792e136d1edb2.zip opensim-SC_OLD-58c53c41de2cae0bb041a2e8121792e136d1edb2.tar.gz opensim-SC_OLD-58c53c41de2cae0bb041a2e8121792e136d1edb2.tar.bz2 opensim-SC_OLD-58c53c41de2cae0bb041a2e8121792e136d1edb2.tar.xz |
Fixed permissions bug related to friends in PermissionsModule. Added FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work.
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLFriendsData.cs')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLFriendsData.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs index af4fd9b..ba1b085 100644 --- a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs +++ b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs | |||
@@ -68,6 +68,11 @@ namespace OpenSim.Data.MSSQL | |||
68 | 68 | ||
69 | public FriendsData[] GetFriends(UUID principalID) | 69 | public FriendsData[] GetFriends(UUID principalID) |
70 | { | 70 | { |
71 | return GetFriends(principalID.ToString()); | ||
72 | } | ||
73 | |||
74 | public FriendsData[] GetFriends(string principalID) | ||
75 | { | ||
71 | using (SqlConnection conn = new SqlConnection(m_ConnectionString)) | 76 | using (SqlConnection conn = new SqlConnection(m_ConnectionString)) |
72 | using (SqlCommand cmd = new SqlCommand()) | 77 | using (SqlCommand cmd = new SqlCommand()) |
73 | { | 78 | { |
@@ -79,5 +84,6 @@ namespace OpenSim.Data.MSSQL | |||
79 | return DoQuery(cmd); | 84 | return DoQuery(cmd); |
80 | } | 85 | } |
81 | } | 86 | } |
87 | |||
82 | } | 88 | } |
83 | } | 89 | } |