diff options
author | Melanie | 2010-03-01 00:02:14 +0000 |
---|---|---|
committer | Melanie | 2010-03-01 00:02:14 +0000 |
commit | bfcc57c0712170e3431617bcb09999bfbb96b8dd (patch) | |
tree | 137f22b0e6eb5f57487c297bbf4be5d197bd60d5 /OpenSim/Data/MySQL/MySQLFriendsData.cs | |
parent | Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensi... (diff) | |
download | opensim-SC-bfcc57c0712170e3431617bcb09999bfbb96b8dd.zip opensim-SC-bfcc57c0712170e3431617bcb09999bfbb96b8dd.tar.gz opensim-SC-bfcc57c0712170e3431617bcb09999bfbb96b8dd.tar.bz2 opensim-SC-bfcc57c0712170e3431617bcb09999bfbb96b8dd.tar.xz |
Change friends to handle offers as it was originally designed. This may
need to be changed in SQLite & MSSQL as well
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLFriendsData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLFriendsData.cs b/OpenSim/Data/MySQL/MySQLFriendsData.cs index 7a43bb6..663fad6 100644 --- a/OpenSim/Data/MySQL/MySQLFriendsData.cs +++ b/OpenSim/Data/MySQL/MySQLFriendsData.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Data.MySQL | |||
59 | { | 59 | { |
60 | MySqlCommand cmd = new MySqlCommand(); | 60 | MySqlCommand cmd = new MySqlCommand(); |
61 | 61 | ||
62 | cmd.CommandText = String.Format("select a.*,b.Flags as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = ?PrincipalID and b.Flags is not null", m_Realm); | 62 | cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = ?PrincipalID", m_Realm); |
63 | cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString()); | 63 | cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString()); |
64 | 64 | ||
65 | return DoQuery(cmd); | 65 | return DoQuery(cmd); |